From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from foss.arm.com (foss.arm.com [217.140.110.172]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 9C5213644D1 for ; Wed, 6 May 2026 22:37:04 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=217.140.110.172 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778107027; cv=none; b=htq9voDOka8FG3PweMGnteNkavkCAdCp0UiowZhV9mBQypVZOOAUh0I81KKSn7NJbz43z+XRKOdHX6JyH0ltlvLHqLKJ3ADDOVtyPkDLos6nsctjYzCURk0G7gyStKZQz3v/YwqnZ63YxRKSUF/yr5qOJ9W1YwyqHSa6BmGMzic= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1778107027; c=relaxed/simple; bh=z2bWlHfLUIap6PxVxOo7F6GK0qYfcOlG0suNtapUE78=; h=Date:From:To:Cc:Subject:Message-ID:In-Reply-To:References: MIME-Version:Content-Type; b=rdbfrnmLEszVs62ECVZnfso67E/42BSt6qg1VtzFlvXKwOanVNFG0FL7rESKhl4IlZJym7UNEknI742e93lia6rkC9Uy/kH1ypOHCIgkt6g4cVhJ31wksrTs52XrEg5Z1KfvFbU7ZEvuiX10+qJQ+wBkgwkT3+Q2vpvfWrXIM5Y= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com; spf=pass smtp.mailfrom=arm.com; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b=c1pHKzY7; arc=none smtp.client-ip=217.140.110.172 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=arm.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=arm.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=arm.com header.i=@arm.com header.b="c1pHKzY7" Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 0C7F11655; Wed, 6 May 2026 15:36:58 -0700 (PDT) Received: from ryzen.lan (usa-sjc-mx-foss1.foss.arm.com [172.31.20.19]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 6720C3F763; Wed, 6 May 2026 15:37:02 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=simple/simple; d=arm.com; s=foss; t=1778107023; bh=z2bWlHfLUIap6PxVxOo7F6GK0qYfcOlG0suNtapUE78=; h=Date:From:To:Cc:Subject:In-Reply-To:References:From; b=c1pHKzY7fZDMDNGdtlHMDcey8S/LHbfz0Auyab6KYV+aw3MYQ3CIoNoKqyX3dfOXn kzLmUOkBShKxgh/2oqX8TuiSDpZ60d1eED/NpNBbqXkBimXPcPsi4bZDY6vnh7fZUi 5aX4XFFKk0kZtZfgYa9S6TAAcKHORnu7Zt6ShFys= Date: Thu, 7 May 2026 00:36:28 +0200 From: Andre Przywara To: Paul Kocialkowski , u-boot@lists.denx.de Cc: Jernej Skrabec , Chen-Yu Tsai , linux-sunxi@lists.linux.dev Subject: Re: [PATCH v2 1/2] sunxi: A523: Move NSI init routine into generic function Message-ID: <20260507003628.6605d894@ryzen.lan> In-Reply-To: <20260430135838.3438728-2-andre.przywara@arm.com> References: <20260430135838.3438728-1-andre.przywara@arm.com> <20260430135838.3438728-2-andre.przywara@arm.com> Organization: Arm Ltd. X-Mailer: Claws Mail 4.4.0 (GTK 3.24.31; x86_64-slackware-linux-gnu) Precedence: bulk X-Mailing-List: linux-sunxi@lists.linux.dev List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: quoted-printable On Thu, 30 Apr 2026 15:58:37 +0200 Andre Przywara wrote: just for the records ... > 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 with for instance the A133 or A523, which have a dedicated > base address for the bus arbiter that is now called NSI instead of MBUS. >=20 > 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. >=20 > In preparation for re-using code for other SoCs, factor out the existing > NSI init routine from the A523 DRAM code, which was a bit ad-hoc and A523 > specific, into a separate function, and abstract the settings a bit. > No functional change. >=20 > Signed-off-by: Andre Przywara > Co-develeoped-by: Paul Kocialkowski > Suggested-by: Jernej =C5=A0krabec > Sponsored-by: MEC Electronics GmbH > --- > .../include/asm/arch-sunxi/cpu_sunxi_ncat2.h | 1 + > .../include/asm/arch-sunxi/dram_sun55i_a523.h | 29 +++++++++++ > arch/arm/include/asm/arch-sunxi/sunxi_nsi.h | 25 ++++++++++ > arch/arm/mach-sunxi/Makefile | 2 +- > arch/arm/mach-sunxi/dram_sun55i_a523.c | 49 +++++++++---------- > arch/arm/mach-sunxi/sunxi_nsi.c | 31 ++++++++++++ > 6 files changed, 110 insertions(+), 27 deletions(-) > create mode 100644 arch/arm/include/asm/arch-sunxi/sunxi_nsi.h > create mode 100644 arch/arm/mach-sunxi/sunxi_nsi.c >=20 > diff --git a/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h b/arch/arm= /include/asm/arch-sunxi/cpu_sunxi_ncat2.h > index 7cee7efe8b4..fd7d9b22058 100644 > --- a/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h > +++ b/arch/arm/include/asm/arch-sunxi/cpu_sunxi_ncat2.h > @@ -9,6 +9,7 @@ > =20 > #define SUNXI_TZPC_BASE 0x02000800 > #define SUNXI_CCM_BASE 0x02001000 > +#define SUNXI_NSI_BASE 0x02020000 > #define SUNXI_TIMER_BASE 0x02050000 > =20 > #define SUNXI_TWI0_BASE 0x02502000 > diff --git a/arch/arm/include/asm/arch-sunxi/dram_sun55i_a523.h b/arch/ar= m/include/asm/arch-sunxi/dram_sun55i_a523.h > index 08bfe462856..462d4726a21 100644 > --- a/arch/arm/include/asm/arch-sunxi/dram_sun55i_a523.h > +++ b/arch/arm/include/asm/arch-sunxi/dram_sun55i_a523.h > @@ -20,6 +20,35 @@ enum sunxi_dram_type { > #define MCTL_COM_UNK_008 0x008 > #define MCTL_COM_MAER0 0x020 > =20 > +enum sunxi_nsi_port { > + SUNXI_NSI_PORT_GPU =3D 0, > + SUNXI_NSI_PORT_GIC, =3D 1, This first comma is of course bollocks, I shouldn't do last minute changes without even compile testing ;-) Cheers, Andre > + SUNXI_NSI_PORT_USB3, =3D 2, > + SUNXI_NSI_PORT_PCIE, =3D 3, > + SUNXI_NSI_PORT_CE, =3D 4, > + SUNXI_NSI_PORT_NPU, =3D 5, > + SUNXI_NSI_PORT_ISP, =3D 6, > + SUNXI_NSI_PORT_DSP, =3D 7, > + SUNXI_NSI_PORT_G2D, =3D 8, > + SUNXI_NSI_PORT_DI, =3D 9, > + SUNXI_NSI_PORT_IOMMU, =3D 10, > + SUNXI_NSI_PORT_VE_R, =3D 11, > + SUNXI_NSI_PORT_VE_RW, =3D 12, > + SUNXI_NSI_PORT_DE, =3D 13, > + SUNXI_NSI_PORT_CSI, =3D 14, > + SUNXI_NSI_PORT_GMAC0, =3D 18, > + SUNXI_NSI_PORT_GMAC1, =3D 19, > + SUNXI_NSI_PORT_MMC0, =3D 20, > + SUNXI_NSI_PORT_MMC1, =3D 21, > + SUNXI_NSI_PORT_MMC2, =3D 22, > + SUNXI_NSI_PORT_USB0, =3D 23, > + SUNXI_NSI_PORT_USB1, =3D 24, > + SUNXI_NSI_PORT_USB2, =3D 25, > + SUNXI_NSI_PORT_NPD, =3D 26, > + SUNXI_NSI_PORT_DMAC, =3D 27, > + SUNXI_NSI_PORT_DMA, =3D 28, > +}; > + > /* > * Controller registers seems to be the same or at least very similar > * to those in H6. > diff --git a/arch/arm/include/asm/arch-sunxi/sunxi_nsi.h b/arch/arm/inclu= de/asm/arch-sunxi/sunxi_nsi.h > new file mode 100644 > index 00000000000..7d41f9318b5 > --- /dev/null > +++ b/arch/arm/include/asm/arch-sunxi/sunxi_nsi.h > @@ -0,0 +1,25 @@ > +// SPDX-License-Identifier: GPL-2.0+ > +/* > + * A133/A523 NSI interconnect register and constant defines > + * > + * (C) Copyright 2026 Arm Ltd. > + */ > + > +#ifndef SUNXI_NSI_H__ > +#define SUNXI_NSI_H__ > + > +#define SUNXI_NSI_PRI_CFG_LOWEST 0 > +#define SUNXI_NSI_PRI_CFG_LOW 1 > +#define SUNXI_NSI_PRI_CFG_HIGH 2 > +#define SUNXI_NSI_PRI_CFG_HIGHEST 3 > + > +#define SUNXI_NSI_IO_CFG_QOS_SEL_OUTPUT 0 > +#define SUNXI_NSI_IO_CFG_QOS_SEL_INPUT 1 > + > +#define NSI_CONF(port, pri, qos_sel) \ > + { SUNXI_NSI_PORT_ ## port, SUNXI_NSI_PRI_CFG_ ## pri, \ > + SUNXI_NSI_IO_CFG_QOS_SEL_ ## qos_sel } > + > +void nsi_configure_port(unsigned int port, u8 pri, u8 qos_sel); > + > +#endif /* SUNXI_NSI_H__ */ > diff --git a/arch/arm/mach-sunxi/Makefile b/arch/arm/mach-sunxi/Makefile > index 0bee04d660f..3ef0113ea43 100644 > --- a/arch/arm/mach-sunxi/Makefile > +++ b/arch/arm/mach-sunxi/Makefile > @@ -50,6 +50,6 @@ obj-$(CONFIG_DRAM_SUN50I_H616) +=3D dram_sun50i_h616.o = dram_dw_helpers.o > obj-$(CONFIG_DRAM_SUN50I_H616) +=3D dram_timings/ > obj-$(CONFIG_DRAM_SUN50I_A133) +=3D dram_sun50i_a133.o > obj-$(CONFIG_DRAM_SUN50I_A133) +=3D dram_timings/ > -obj-$(CONFIG_MACH_SUN55I_A523) +=3D dram_sun55i_a523.o dram_dw_helpers.o > +obj-$(CONFIG_MACH_SUN55I_A523) +=3D dram_sun55i_a523.o dram_dw_helpers.o= sunxi_nsi.o > obj-$(CONFIG_DRAM_SUN55I_A523) +=3D dram_timings/ > endif > diff --git a/arch/arm/mach-sunxi/dram_sun55i_a523.c b/arch/arm/mach-sunxi= /dram_sun55i_a523.c > index 1ffb62863e2..9fb054cea84 100644 > --- a/arch/arm/mach-sunxi/dram_sun55i_a523.c > +++ b/arch/arm/mach-sunxi/dram_sun55i_a523.c > @@ -15,6 +15,7 @@ > #include > #include > #include > +#include > #include > #include > =20 > @@ -1412,40 +1413,36 @@ static const struct dram_para para =3D { > .tpr10 =3D CONFIG_DRAM_SUNXI_TPR10, > }; > =20 > -static void sunxi_nsi_init(void) > +static void nsi_set_master_priority(void) > { > - /* IOMMU prio 3 */ > - writel(0x1, 0x02021418); > - writel(0xf, 0x02021414); > - /* DE prio 2 */ > - writel(0x1, 0x02021a18); > - writel(0xa, 0x02021a14); > - /* VE R prio 2 */ > - writel(0x1, 0x02021618); > - writel(0xa, 0x02021614); > - /* VE RW prio 2 */ > - writel(0x1, 0x02021818); > - writel(0xa, 0x02021814); > - /* ISP prio 2 */ > - writel(0x1, 0x02020c18); > - writel(0xa, 0x02020c14); > - /* CSI prio 2 */ > - writel(0x1, 0x02021c18); > - writel(0xa, 0x02021c14); > - /* NPU prio 2 */ > - writel(0x1, 0x02020a18); > - writel(0xa, 0x02020a14); > + struct { > + unsigned int port; > + u8 pri; > + u8 qos_sel; > + } ports[] =3D { > + NSI_CONF(NPU, HIGH, INPUT), > + NSI_CONF(ISP, HIGH, INPUT), > + NSI_CONF(IOMMU, HIGHEST, INPUT), > + NSI_CONF(VE_R, HIGH, INPUT), > + NSI_CONF(VE_RW, HIGH, INPUT), > + NSI_CONF(DE, HIGH, INPUT), > + NSI_CONF(CSI, HIGH, INPUT), > + }; > + unsigned int i; > + > + for (i =3D 0; i < ARRAY_SIZE(ports); i++) > + nsi_configure_port(ports[i].port, ports[i].pri, > + ports[i].qos_sel); > =20 > /* close ra0 autogating */ > - writel(0x0, 0x02023c00); > + writel(0x0, 0x02023c00); /* port 30 */ > /* close ta autogating */ > - writel(0x0, 0x02023e00); > + writel(0x0, 0x02023e00); /* port 31 */ > /* close pcie autogating */ > writel(0x0, 0x02020600); > } > =20 > static void init_something(void) > - > { > u32 *ptr =3D (u32 *)0x02000804; > =20 > @@ -1507,7 +1504,7 @@ unsigned long sunxi_dram_init(void) > =20 > size =3D mctl_calc_size(&config); > =20 > - sunxi_nsi_init(); > + nsi_set_master_priority(); > init_something(); > =20 > return size; > diff --git a/arch/arm/mach-sunxi/sunxi_nsi.c b/arch/arm/mach-sunxi/sunxi_= nsi.c > new file mode 100644 > index 00000000000..3d7eb43df46 > --- /dev/null > +++ b/arch/arm/mach-sunxi/sunxi_nsi.c > @@ -0,0 +1,31 @@ > +#include > +#include > +#include > + > +#define SUNXI_NSI_MODE_REG(i) ((i) * 0x200 + 0x10) > +#define SUNXI_NSI_PRI_CFG_REG(i) ((i) * 0x200 + 0x14) > +#define SUNXI_NSI_PRI_CFG_RD(v) (((v) & 0x3) << 2) > +#define SUNXI_NSI_PRI_CFG_WR(v) ((v) & 0x3) > +#define SUNXI_NSI_IO_CFG_REG(i) ((i) * 0x200 + 0x18) > +#define SUNXI_NSI_ENABLE_REG(i) ((i) * 0x200 + 0xc0) > + > +void nsi_configure_port(unsigned int port, u8 pri, u8 qos_sel) > +{ > + void *base =3D (void *)SUNXI_NSI_BASE; > + u32 pri_cfg; > + > + /* QoS with bandwidth limits is not supported, disable it. */ > + writel(0, base + SUNXI_NSI_MODE_REG(port)); > + writel(0, base + SUNXI_NSI_ENABLE_REG(port)); > + > + /* > + * 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, base + SUNXI_NSI_IO_CFG_REG(port)); > + > + /* Port priority is always active. */ > + pri_cfg =3D SUNXI_NSI_PRI_CFG_RD(pri) | SUNXI_NSI_PRI_CFG_WR(pri); > + > + writel(pri_cfg, base + SUNXI_NSI_PRI_CFG_REG(port)); > +}