LM
/
u-boot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

arm: rmobile: gose: Update to QoS revision 0.311 

This updates r8a7793 QoS to revision 0.311.

Signed-off-by: Kouei Abe <kouei.abe.cp@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <nobuhiro.iwamatsu.yj@renesas.com>
Signed-off-by: Nobuhiro Iwamatsu <iwamatsu@nigauri.org>
This commit is contained in:
Nobuhiro Iwamatsu 2015-03-05 08:30:39 +09:00 committed by Nobuhiro Iwamatsu
parent c56af554dd
commit 98c3322c4e
2 changed files with 61 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm/cpu/armv7/rmobile/Kconfig
View File

@ -52,7 +52,7 @@ config RMOBILE_EXTRAM_BOOT
choice choice
prompt "Qos setting primary" prompt "Qos setting primary"
depends on TARGET_KOELSCH || TARGET_LAGER depends on TARGET_GOSE || TARGET_KOELSCH || TARGET_LAGER
default QOS_PRI_NORMAL default QOS_PRI_NORMAL
config QOS_PRI_NORMAL config QOS_PRI_NORMAL

60
board/renesas/gose/qos.c
View File

@ -14,7 +14,7 @@
#include <asm/arch/rmobile.h> #include <asm/arch/rmobile.h>
#if defined(CONFIG_RMOBILE_EXTRAM_BOOT) #if defined(CONFIG_RMOBILE_EXTRAM_BOOT)
/* QoS version 0.20 */ /* QoS version 0.311 */
enum { enum {
DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04, DBSC3_00, DBSC3_01, DBSC3_02, DBSC3_03, DBSC3_04,
DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09, DBSC3_05, DBSC3_06, DBSC3_07, DBSC3_08, DBSC3_09,
@ -61,6 +61,24 @@ static u32 dbsc3_0_w_qos_addr[DBSC3_NR] = {
[DBSC3_15] = DBSC3_0_QOS_W15_BASE, [DBSC3_15] = DBSC3_0_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) void qos_init(void)
{ {
int i; int i;
@ -77,34 +95,62 @@ void qos_init(void)
/* S3C -QoS */ /* S3C -QoS */
s3c = (struct rcar_s3c *)S3C_BASE; s3c = (struct rcar_s3c *)S3C_BASE;
writel(0x00000000, &s3c->s3cadsplcr); writel(0x00000000, &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(0x1F0B0908, &s3c->s3crorr);
writel(0x1F0C0A08, &s3c->s3cworr); writel(0x1F0C0A08, &s3c->s3cworr);
} else if (is_qos_pri_gfx()) {
writel(0x1F0B0B0B, &s3c->s3crorr);
writel(0x1F0E0C0C, &s3c->s3cworr);
}
/* QoS Control Registers */ /* QoS Control Registers */
s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_CCI0_BASE; s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_CCI0_BASE;
writel(0x00890089, &s3c_qos->s3cqos0); writel(0x00890089, &s3c_qos->s3cqos0);
writel(0x20960010, &s3c_qos->s3cqos1); writel(0x20960010, &s3c_qos->s3cqos1);
writel(0x20302030, &s3c_qos->s3cqos2); writel(0x20302030, &s3c_qos->s3cqos2);
if (is_qos_pri_media())
writel(0x20AA2300, &s3c_qos->s3cqos3);
else if (is_qos_pri_normal())
writel(0x20AA2200, &s3c_qos->s3cqos3); writel(0x20AA2200, &s3c_qos->s3cqos3);
else if (is_qos_pri_gfx())
writel(0x20AA2100, &s3c_qos->s3cqos3);
writel(0x00002032, &s3c_qos->s3cqos4); writel(0x00002032, &s3c_qos->s3cqos4);
writel(0x20960010, &s3c_qos->s3cqos5); writel(0x20960010, &s3c_qos->s3cqos5);
writel(0x20302030, &s3c_qos->s3cqos6); writel(0x20302030, &s3c_qos->s3cqos6);
if (is_qos_pri_media())
writel(0x20AA2300, &s3c_qos->s3cqos7);
else if (is_qos_pri_normal())
writel(0x20AA2200, &s3c_qos->s3cqos7); writel(0x20AA2200, &s3c_qos->s3cqos7);
else if (is_qos_pri_gfx())
writel(0x20AA2100, &s3c_qos->s3cqos7);
writel(0x00002032, &s3c_qos->s3cqos8); writel(0x00002032, &s3c_qos->s3cqos8);
s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_CCI1_BASE; s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_CCI1_BASE;
writel(0x00890089, &s3c_qos->s3cqos0); writel(0x00890089, &s3c_qos->s3cqos0);
writel(0x20960010, &s3c_qos->s3cqos1); writel(0x20960010, &s3c_qos->s3cqos1);
writel(0x20302030, &s3c_qos->s3cqos2); writel(0x20302030, &s3c_qos->s3cqos2);
if (is_qos_pri_media())
writel(0x20AA2300, &s3c_qos->s3cqos3);
else if (is_qos_pri_normal())
writel(0x20AA2200, &s3c_qos->s3cqos3); writel(0x20AA2200, &s3c_qos->s3cqos3);
else if (is_qos_pri_gfx())
writel(0x20AA2100, &s3c_qos->s3cqos3);
writel(0x00002032, &s3c_qos->s3cqos4); writel(0x00002032, &s3c_qos->s3cqos4);
writel(0x20960010, &s3c_qos->s3cqos5); writel(0x20960010, &s3c_qos->s3cqos5);
writel(0x20302030, &s3c_qos->s3cqos6); writel(0x20302030, &s3c_qos->s3cqos6);
if (is_qos_pri_media())
writel(0x20AA2300, &s3c_qos->s3cqos7);
else if (is_qos_pri_normal())
writel(0x20AA2200, &s3c_qos->s3cqos7); writel(0x20AA2200, &s3c_qos->s3cqos7);
else if (is_qos_pri_gfx())
writel(0x20AA2100, &s3c_qos->s3cqos7);
writel(0x00002032, &s3c_qos->s3cqos4);
writel(0x00002032, &s3c_qos->s3cqos8); writel(0x00002032, &s3c_qos->s3cqos8);
s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_MXI_BASE; s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_MXI_BASE;
writel(0x00820082, &s3c_qos->s3cqos0); writel(0x00820092, &s3c_qos->s3cqos0);
writel(0x20960020, &s3c_qos->s3cqos1); writel(0x20960020, &s3c_qos->s3cqos1);
writel(0x20302030, &s3c_qos->s3cqos2); writel(0x20302030, &s3c_qos->s3cqos2);
writel(0x20AA20DC, &s3c_qos->s3cqos3); writel(0x20AA20DC, &s3c_qos->s3cqos3);
@ -115,7 +161,7 @@ void qos_init(void)
writel(0x00002032, &s3c_qos->s3cqos8); writel(0x00002032, &s3c_qos->s3cqos8);
s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_AXI_BASE; s3c_qos = (struct rcar_s3c_qos *)S3C_QOS_AXI_BASE;
writel(0x00820082, &s3c_qos->s3cqos0); writel(0x00820092, &s3c_qos->s3cqos0);
writel(0x20960020, &s3c_qos->s3cqos1); writel(0x20960020, &s3c_qos->s3cqos1);
writel(0x20302030, &s3c_qos->s3cqos2); writel(0x20302030, &s3c_qos->s3cqos2);
writel(0x20AA20FA, &s3c_qos->s3cqos3); writel(0x20AA20FA, &s3c_qos->s3cqos3);
@ -166,11 +212,13 @@ void qos_init(void)
/* Transaction Control (MXI) */ /* Transaction Control (MXI) */
mxi = (struct rcar_mxi *)MXI_BASE; mxi = (struct rcar_mxi *)MXI_BASE;
writel(0x00000013, &mxi->mxrtcr); writel(0x00000013, &mxi->mxrtcr);
writel(0x00000013, &mxi->mxwtcr); writel(0x00000016, &mxi->mxwtcr);
writel(0x00200000, &mxi->mxs3cracr); writel(0x00200000, &mxi->mxs3cracr);
writel(0x00200000, &mxi->mxs3cwacr); writel(0x00200000, &mxi->mxs3cwacr);
writel(0x00200000, &mxi->mxaxiracr); writel(0x00200000, &mxi->mxaxiracr);
writel(0x00200000, &mxi->mxaxiwacr); writel(0x00200000, &mxi->mxaxiwacr);
writel(0x00780080, &mxi->mxsaar0);
writel(0x02000800, &mxi->mxsaar1);
/* QoS Control (MXI) */ /* QoS Control (MXI) */
mxi_qos = (struct rcar_mxi_qos *)MXI_QOS_BASE; mxi_qos = (struct rcar_mxi_qos *)MXI_QOS_BASE;
@ -554,7 +602,7 @@ void qos_init(void)
/* QoS Register (RT-AXI) */ /* QoS Register (RT-AXI) */
axi_qos = (struct rcar_axi_qos *)RT_AXI_SHX_BASE; axi_qos = (struct rcar_axi_qos *)RT_AXI_SHX_BASE;
writel(0x00000000, &axi_qos->qosconf); writel(0x00000001, &axi_qos->qosconf);
writel(0x00002053, &axi_qos->qosctset0); writel(0x00002053, &axi_qos->qosctset0);
writel(0x00002096, &axi_qos->qosctset1); writel(0x00002096, &axi_qos->qosctset1);
writel(0x00002030, &axi_qos->qosctset2); writel(0x00002030, &axi_qos->qosctset2);