Merge branch 'rmobile' of git://git.denx.de/u-boot-sh

[platform/kernel/u-boot.git] / board / renesas / koelsch / qos.c

diff --git a/board/renesas/koelsch/qos.c b/board/renesas/koelsch/qos.c
index 55a0420..8cb2b48 100644 (file)
--- a/board/renesas/koelsch/qos.c
+++ b/board/renesas/koelsch/qos.c
@@ -13,8 +13,8 @@
 #include <asm/io.h>
 #include <asm/arch/rmobile.h>
 
-/* QoS version 0.240 for ES1 and version 0.310 for ES2 */
-
+/* QoS version 0.240 for ES1 and version 0.411 for ES2 */
+#if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
 enum {
        DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
        DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@@ -99,6 +99,24 @@ static u32 dbsc3_1_w_qos_addr[DBSC3_NR] = {
        [DBSC3_15] = DBSC3_1_QOS_W15_BASE,
 };
 
+#if defined(CONFIG_QOS_PRI_MEDIA)
+#define is_qos_pri_media()     1
+#else
+#define is_qos_pri_media()     0
+#endif
+
+#if defined(CONFIG_QOS_PRI_NORMAL)
+#define is_qos_pri_normal()    1
+#else
+#define is_qos_pri_normal()    0
+#endif
+
+#if defined(CONFIG_QOS_PRI_GFX)
+#define is_qos_pri_gfx()       1
+#else
+#define is_qos_pri_gfx()       0
+#endif
+
 void qos_init(void)
 {
        int i;
@@ -116,10 +134,25 @@ void qos_init(void)
        /* S3C -QoS */
        s3c = (struct rcar_s3c *)S3C_BASE;
        if (IS_R8A7791_ES2()) {
-               writel(0x00FF1B0D, &s3c->s3cadsplcr);
-               writel(0x1F0D0B0A, &s3c->s3crorr);
-               writel(0x1F0D0B09, &s3c->s3cworr);
-               writel(0x00200808, &s3c->s3carcr11);
+               /* Linear All mode */
+               /* writel(0x00000000, &s3c->s3cadsplcr); */
+               /* Linear Linear 0x7000 to 0x7800 mode */
+               writel(0x00BF1B0C, &s3c->s3cadsplcr);
+               /* Split Linear 0x6800 t 0x7000 mode */
+               /* writel(0x00DF1B0C, &s3c->s3cadsplcr); */
+               /* Ssplit All mode */
+               /* writel(0x00FF1B0C, &s3c->s3cadsplcr); */
+
+               if (is_qos_pri_media()) {
+                       writel(0x1F0B0604, &s3c->s3crorr);
+                       writel(0x1F0E0705, &s3c->s3cworr);
+               } else if (is_qos_pri_normal()) {
+                       writel(0x1F0B0908, &s3c->s3crorr);
+                       writel(0x1F0E0A08, &s3c->s3cworr);
+               } else if (is_qos_pri_gfx()) {
+                       writel(0x1F0B0B0B, &s3c->s3crorr);
+                       writel(0x1F0E0C0C, &s3c->s3cworr);
+               }
        } else {
                writel(0x00FF1B1D, &s3c->s3cadsplcr);
                writel(0x1F0D0C0C, &s3c->s3crorr);
@@ -130,22 +163,60 @@ void qos_init(void)
        writel(0x00890089, &s3c_qos->s3cqos0);
        writel(0x20960010, &s3c_qos->s3cqos1);
        writel(0x20302030, &s3c_qos->s3cqos2);
-       writel(0x20AA2200, &s3c_qos->s3cqos3);
+
+       if (IS_R8A7791_ES2()) {
+               if (is_qos_pri_media())
+                       writel(0x20AA2300, &s3c_qos->s3cqos3);
+               else if (is_qos_pri_normal())
+                       writel(0x20AA2200, &s3c_qos->s3cqos3);
+               else if (is_qos_pri_gfx())
+                       writel(0x20AA2100, &s3c_qos->s3cqos3);
+       } else {
+               writel(0x20AA2200, &s3c_qos->s3cqos3);
+       }
        writel(0x00002032, &s3c_qos->s3cqos4);
        writel(0x20960010, &s3c_qos->s3cqos5);
        writel(0x20302030, &s3c_qos->s3cqos6);
-       writel(0x20AA2200, &s3c_qos->s3cqos7);
+
+       if (IS_R8A7791_ES2()) {
+               if (is_qos_pri_media())
+                       writel(0x20AA2300, &s3c_qos->s3cqos7);
+               else if (is_qos_pri_normal())
+                       writel(0x20AA2200, &s3c_qos->s3cqos7);
+               else if (is_qos_pri_gfx())
+                       writel(0x20AA2100, &s3c_qos->s3cqos7);
+       } else {
+               writel(0x20AA2200, &s3c_qos->s3cqos7);
+       }
        writel(0x00002032, &s3c_qos->s3cqos8);
 
        s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_CCI1_BASE;
        writel(0x00890089, &s3c_qos->s3cqos0);
        writel(0x20960010, &s3c_qos->s3cqos1);
        writel(0x20302030, &s3c_qos->s3cqos2);
-       writel(0x20AA2200, &s3c_qos->s3cqos3);
+       if (IS_R8A7791_ES2()) {
+               if (is_qos_pri_media())
+                       writel(0x20AA2300, &s3c_qos->s3cqos3);
+               else if (is_qos_pri_normal())
+                       writel(0x20AA2200, &s3c_qos->s3cqos3);
+               else if (is_qos_pri_gfx())
+                       writel(0x20AA2100, &s3c_qos->s3cqos3);
+       } else {
+               writel(0x20AA2200, &s3c_qos->s3cqos3);
+       }
        writel(0x00002032, &s3c_qos->s3cqos4);
        writel(0x20960010, &s3c_qos->s3cqos5);
        writel(0x20302030, &s3c_qos->s3cqos6);
-       writel(0x20AA2200, &s3c_qos->s3cqos7);
+       if (IS_R8A7791_ES2()) {
+               if (is_qos_pri_media())
+                       writel(0x20AA2300, &s3c_qos->s3cqos7);
+               else if (is_qos_pri_normal())
+                       writel(0x20AA2200, &s3c_qos->s3cqos7);
+               else if (is_qos_pri_gfx())
+                       writel(0x20AA2100, &s3c_qos->s3cqos7);
+       } else {
+               writel(0x20AA2200, &s3c_qos->s3cqos7);
+       }
        writel(0x00002032, &s3c_qos->s3cqos8);
 
        s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_MXI_BASE;
@@ -163,7 +234,10 @@ void qos_init(void)
        writel(0x00002032, &s3c_qos->s3cqos8);
 
        s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_AXI_BASE;
-       writel(0x00820082, &s3c_qos->s3cqos0);
+       if (IS_R8A7791_ES2())
+               writel(0x80928092, &s3c_qos->s3cqos0);
+       else
+               writel(0x00820082, &s3c_qos->s3cqos0);
        writel(0x20960020, &s3c_qos->s3cqos1);
        writel(0x20302030, &s3c_qos->s3cqos2);
        writel(0x20AA20FA, &s3c_qos->s3cqos3);
@@ -185,7 +259,7 @@ void qos_init(void)
                writel(0x00000001, &qos_addr->dbrqctr);
                writel(0x00002078, &qos_addr->dbthres0);
                writel(0x0000204B, &qos_addr->dbthres1);
-               writel(0x00001FE7, &qos_addr->dbthres2);
+               writel(0x0000201E, &qos_addr->dbthres2);
                writel(0x00000001, &qos_addr->dblgqon);
        }
 
@@ -193,13 +267,13 @@ void qos_init(void)
        for (i = DBSC3_00; i < DBSC3_NR; i++) {
                qos_addr = (struct rcar_dbsc3_qos *)dbsc3_0_w_qos_addr[i];
                writel(0x00000002, &qos_addr->dblgcnt);
-               writel(0x000020EB, &qos_addr->dbtmval0);
-               writel(0x0000206E, &qos_addr->dbtmval1);
+               writel(0x00002096, &qos_addr->dbtmval0);
+               writel(0x00002064, &qos_addr->dbtmval1);
                writel(0x00002050, &qos_addr->dbtmval2);
                writel(0x0000203A, &qos_addr->dbtmval3);
                writel(0x00000001, &qos_addr->dbrqctr);
                writel(0x00002078, &qos_addr->dbthres0);
-               writel(0x0000205A, &qos_addr->dbthres1);
+               writel(0x0000204B, &qos_addr->dbthres1);
                writel(0x0000203C, &qos_addr->dbthres2);
                writel(0x00000001, &qos_addr->dblgqon);
        }
@@ -215,7 +289,7 @@ void qos_init(void)
                writel(0x00000001, &qos_addr->dbrqctr);
                writel(0x00002078, &qos_addr->dbthres0);
                writel(0x0000204B, &qos_addr->dbthres1);
-               writel(0x00001FE7, &qos_addr->dbthres2);
+               writel(0x0000201E, &qos_addr->dbthres2);
                writel(0x00000001, &qos_addr->dblgqon);
        }
 
@@ -223,13 +297,13 @@ void qos_init(void)
        for (i = DBSC3_00; i < DBSC3_NR; i++) {
                qos_addr = (struct rcar_dbsc3_qos *)dbsc3_1_w_qos_addr[i];
                writel(0x00000002, &qos_addr->dblgcnt);
-               writel(0x000020EB, &qos_addr->dbtmval0);
-               writel(0x0000206E, &qos_addr->dbtmval1);
+               writel(0x00002096, &qos_addr->dbtmval0);
+               writel(0x00002064, &qos_addr->dbtmval1);
                writel(0x00002050, &qos_addr->dbtmval2);
                writel(0x0000203A, &qos_addr->dbtmval3);
                writel(0x00000001, &qos_addr->dbrqctr);
                writel(0x00002078, &qos_addr->dbthres0);
-               writel(0x0000205A, &qos_addr->dbthres1);
+               writel(0x0000204B, &qos_addr->dbthres1);
                writel(0x0000203C, &qos_addr->dbthres2);
                writel(0x00000001, &qos_addr->dblgqon);
        }
@@ -242,17 +316,21 @@ void qos_init(void)
 
        /* MXI -QoS */
        /* Transaction Control (MXI) */
-       mxi = (struct rcar_mxi *)MXI_BASE;
+       mxi = (struct rcar_mxi *)XI_BASE;
        writel(0x00000013, &mxi->mxrtcr);
-       writel(0x00000013, &mxi->mxwtcr);
-       writel(0x00780080, &mxi->mxsaar0);
-       writel(0x02000800, &mxi->mxsaar1);
+       if (IS_R8A7791_ES2()) {
+               writel(0x00000016, &mxi->mxwtcr);
+               writel(0x00780080, &mxi->mxsaar0);
+               writel(0x02000800, &mxi->mxsaar1);
+       } else {
+               writel(0x00000013, &mxi->mxwtcr);
+       }
 
        /* QoS Control (MXI) */
        mxi_qos = (struct rcar_mxi_qos *)MXI_QOS_BASE;
        writel(0x0000000C, &mxi_qos->vspdu0);
        writel(0x0000000C, &mxi_qos->vspdu1);
-       writel(0x0000000D, &mxi_qos->du0);
+       writel(0x0000000E, &mxi_qos->du0);
        writel(0x0000000D, &mxi_qos->du1);
 
        /* AXI -QoS */
@@ -631,7 +709,10 @@ void qos_init(void)
 
        /* QoS Register (RT-AXI) */
        axi_qos = (struct rcar_axi_qos *)RT_AXI_SHX_BASE;
-       writel(0x00000000, &axi_qos->qosconf);
+       if (IS_R8A7791_ES2())
+               writel(0x00000001, &axi_qos->qosconf);
+       else
+               writel(0x00000000, &axi_qos->qosconf);
        writel(0x00002053, &axi_qos->qosctset0);
        writel(0x00002096, &axi_qos->qosctset1);
        writel(0x00002030, &axi_qos->qosctset2);
@@ -1303,3 +1384,8 @@ void qos_init(void)
        writel(0x00000001, &axi_qos->qosthres2);
        writel(0x00000001, &axi_qos->qosqon);
 }
+#else /* CONFIG_RMOBILE_EXTRAM_BOOT */
+void qos_init(void)
+{
+}
+#endif /* CONFIG_RMOBILE_EXTRAM_BOOT */