In previous generations of Allwinner SoCs, the memory bus (MBUS) access arbitration was configured as part of the DRAM top registers. This is no longer the case starting with the A133, which has a dedicated base address for the bus arbiter that is now called NSI instead of MBUS.
NSI appears to be a later iteration of MBUS design, with new dedicated registers that resemble the previous MBUS ones. Despite NSI not being documented in the manual, the A133 BSP includes a nsi driver with some description of the registers. Like previous generations, it implements port arbitration priority for DRAM access and also supports an optional QoS mode based on bandwidth limits. Configuring port arbitration priority is especially important to make sure that critical masters are not starved by other less important ones. This is especially the case with the display engine that needs to be able to fetch pixels in time for scanout and can easily be starved by CPU or GPU access. This introduces support for the NSI arbiter in the A133 DRAM init code. The list and order of available ports are highly SoC-specific and the default config values are set to match the BSP's defaults. Signed-off-by: Paul Kocialkowski <[email protected]> --- .../include/asm/arch-sunxi/cpu_sun50i_h6.h | 4 ++ .../include/asm/arch-sunxi/dram_sun50i_a133.h | 50 ++++++++++++++ arch/arm/mach-sunxi/dram_sun50i_a133.c | 65 ++++++++++++++++++- 3 files changed, 118 insertions(+), 1 deletion(-) diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h index 2a9b086991c3..8e80c520706b 100644 --- a/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h +++ b/arch/arm/include/asm/arch-sunxi/cpu_sun50i_h6.h @@ -16,6 +16,10 @@ #define SUNXI_GIC400_BASE 0x03020000 +#ifdef CONFIG_MACH_SUN50I_A133 +#define SUNXI_NSI_BASE 0x03100000 +#endif + #ifdef CONFIG_MACH_SUN50I_H6 #define SUNXI_DRAM_COM_BASE 0x04002000 #define SUNXI_DRAM_CTL0_BASE 0x04003000 diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun50i_a133.h b/arch/arm/include/asm/arch-sunxi/dram_sun50i_a133.h index a5fc6ad36560..a526e55e7bb9 100644 --- a/arch/arm/include/asm/arch-sunxi/dram_sun50i_a133.h +++ b/arch/arm/include/asm/arch-sunxi/dram_sun50i_a133.h @@ -24,6 +24,56 @@ static inline int ns_to_t(int nanoseconds) return DIV_ROUND_UP(ctrl_freq * nanoseconds, 1000); } +#define SUNXI_NSI_PORT_PRI_CFG_RD(v) (((v) & 0x3) << 2) +#define SUNXI_NSI_PORT_PRI_CFG_WR(v) ((v) & 0x3) +#define SUNXI_NSI_PRI_LOWEST 0 +#define SUNXI_NSI_PRI_LOW 1 +#define SUNXI_NSI_PRI_HIGH 2 +#define SUNXI_NSI_PRI_HIGHEST 3 +#define SUNXI_NSI_QOS_SEL_OUTPUT 0 +#define SUNXI_NSI_QOS_SEL_INPUT 1 + +struct sunxi_nsi_port_reg { + u32 reserved0[4]; + u32 mode; + u32 pri_cfg; + u32 io_cfg; + u32 reserved1[41]; + u32 enable; + u32 clr; + u32 cycle; + u32 rq_rd; + u32 rq_wr; + u32 dt_rd; + u32 dt_wr; + u32 la_rd; + u32 la_wr; + u32 reserved2[71]; +}; + +struct sunxi_nsi_reg { + struct sunxi_nsi_port_reg cpu; + struct sunxi_nsi_port_reg gpu; + struct sunxi_nsi_port_reg sd1; + struct sunxi_nsi_port_reg mstg; + struct sunxi_nsi_port_reg gmac0; + struct sunxi_nsi_port_reg gmac1; + struct sunxi_nsi_port_reg usb0; + struct sunxi_nsi_port_reg usb1; + struct sunxi_nsi_port_reg ndfc; + struct sunxi_nsi_port_reg dmac; + struct sunxi_nsi_port_reg ce; + struct sunxi_nsi_port_reg de0; + struct sunxi_nsi_port_reg de1; + struct sunxi_nsi_port_reg ve; + struct sunxi_nsi_port_reg csi; + struct sunxi_nsi_port_reg isp; + struct sunxi_nsi_port_reg g2d; + struct sunxi_nsi_port_reg eink; + struct sunxi_nsi_port_reg iommu; + struct sunxi_nsi_port_reg cpus; +}; + /* MBUS part is largely the same as in H6, except for one special register */ #define MCTL_COM_UNK_008 0x008 /* NOTE: This register has the same importance as mctl_ctl->clken in H616 */ diff --git a/arch/arm/mach-sunxi/dram_sun50i_a133.c b/arch/arm/mach-sunxi/dram_sun50i_a133.c index 1496f99624dd..6327f00ff5ea 100644 --- a/arch/arm/mach-sunxi/dram_sun50i_a133.c +++ b/arch/arm/mach-sunxi/dram_sun50i_a133.c @@ -69,6 +69,64 @@ static const u8 phy_init[] = { }; #endif +static void nsi_configure_port(struct sunxi_nsi_port_reg *port, u8 pri, + u8 qos_sel) +{ + u32 pri_cfg; + + /* QoS with bandwidth limits is not supported, disable it. */ + writel(0, &port->mode); + writel(0, &port->enable); + + /* + * QoS direction selection should not be in use, but set it nevertheless + * to match the BSP behavior (in case it has some other meaning). + */ + writel(qos_sel, &port->io_cfg); + + /* Port priority is always active. */ + pri_cfg = SUNXI_NSI_PORT_PRI_CFG_RD(pri) | + SUNXI_NSI_PORT_PRI_CFG_WR(pri); + + writel(pri_cfg, &port->pri_cfg); +} + +static void nsi_set_master_priority(void) +{ + struct sunxi_nsi_reg *nsi = (struct sunxi_nsi_reg *)SUNXI_NSI_BASE; + struct { + struct sunxi_nsi_port_reg *port; + u8 pri; + u8 qos_sel; + } ports[] = { + { &nsi->cpu, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->gpu, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->sd1, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->mstg, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->gmac0, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->gmac1, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->usb0, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->usb1, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->ndfc, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->dmac, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->ce, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->de0, SUNXI_NSI_PRI_HIGH, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->de1, SUNXI_NSI_PRI_HIGH, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->ve, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->csi, SUNXI_NSI_PRI_HIGH, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->isp, SUNXI_NSI_PRI_HIGH, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->g2d, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->eink, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + { &nsi->iommu, SUNXI_NSI_PRI_HIGHEST, SUNXI_NSI_QOS_SEL_INPUT }, + { &nsi->cpus, SUNXI_NSI_PRI_LOWEST, SUNXI_NSI_QOS_SEL_OUTPUT }, + }; + unsigned int i; + + for (i = 0; i < ARRAY_SIZE(ports); i++) + nsi_configure_port(ports[i].port, ports[i].pri, + ports[i].qos_sel); +} + static void mctl_clk_init(u32 clk) { void * const ccm = (void *)SUNXI_CCM_BASE; @@ -1184,6 +1242,7 @@ static const struct dram_para para = { unsigned long sunxi_dram_init(void) { struct dram_config config; + unsigned long size; /* Writing to undocumented SYS_CFG area, according to user manual. */ setbits_le32(0x03000160, BIT(8)); @@ -1200,5 +1259,9 @@ unsigned long sunxi_dram_init(void) 1U << config.bankgrps, 1U << config.ranks, 16U << config.bus_full_width); - return calculate_dram_size(&config); + size = calculate_dram_size(&config); + + nsi_set_master_priority(); + + return size; } -- 2.50.1
