Received-SPF: pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67;
Date:   Fri, 23 Feb 2018 16:03:05 +0100
From:   Maxime Ripard <maxime.ripard@bootlin.com>
To:     =?iso-8859-1?Q?Myl=E8ne?= Josserand <mylene.josserand@bootlin.com>
Cc:     linux@armlinux.org.uk, wens@csie.org, robh+dt@kernel.org,
        mark.rutland@arm.com, devicetree@vger.kernel.org,
        linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org,
        clabbe.montjoie@gmail.com, thomas.petazzoni@bootlin.com,
        quentin.schulz@bootlin.com
Subject: Re: [PATCH v4 03/10] ARM: sun8i: smp: Add support for A83T
Message-ID: <20180223150305.7jsuxay2idzvcy2w@flea.lan>
References: <20180223133742.26044-1-mylene.josserand@bootlin.com>
 <20180223133742.26044-4-mylene.josserand@bootlin.com>
MIME-Version: 1.0
Content-Type: multipart/signed; micalg=pgp-sha256;
        protocol="application/pgp-signature"; boundary="h6jqcllclooy7hs2"
Content-Disposition: inline
In-Reply-To: <20180223133742.26044-4-mylene.josserand@bootlin.com>
User-Agent: NeoMutt/20171215
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk


--h6jqcllclooy7hs2
Content-Type: text/plain; charset=iso-8859-1
Content-Disposition: inline
Content-Transfer-Encoding: quoted-printable

On Fri, Feb 23, 2018 at 02:37:35PM +0100, Myl=E8ne Josserand wrote:
> Add the support for A83T.
>=20
> A83T SoC has an additional register than A80 to handle CPU configurations:
> R_CPUS_CFG. Information about the register comes from Allwinner's BSP
> driver.
> An important difference is the Power Off Gating register for clusters
> which is BIT(4) in case of SUN9I-A80 and BIT(0) in case of SUN8I-A83T.
>=20
> Signed-off-by: Myl=E8ne Josserand <mylene.josserand@bootlin.com>
> ---
>  arch/arm/mach-sunxi/Kconfig  |   2 +-
>  arch/arm/mach-sunxi/mc_smp.c | 168 +++++++++++++++++++++++++++++++++++++=
++++--
>  2 files changed, 162 insertions(+), 8 deletions(-)
>=20
> diff --git a/arch/arm/mach-sunxi/Kconfig b/arch/arm/mach-sunxi/Kconfig
> index ce53ceaf4cc5..a0ad35c41c02 100644
> --- a/arch/arm/mach-sunxi/Kconfig
> +++ b/arch/arm/mach-sunxi/Kconfig
> @@ -51,7 +51,7 @@ config MACH_SUN9I
>  config ARCH_SUNXI_MC_SMP
>  	bool
>  	depends on SMP
> -	default MACH_SUN9I
> +	default y if MACH_SUN9I || MACH_SUN8I
>  	select ARM_CCI400_PORT_CTRL
>  	select ARM_CPU_SUSPEND
> =20
> diff --git a/arch/arm/mach-sunxi/mc_smp.c b/arch/arm/mach-sunxi/mc_smp.c
> index de02e5662557..3bd9066a1422 100644
> --- a/arch/arm/mach-sunxi/mc_smp.c
> +++ b/arch/arm/mach-sunxi/mc_smp.c
> @@ -55,22 +55,32 @@
>  #define CPUCFG_CX_RST_CTRL_L2_RST	BIT(8)
>  #define CPUCFG_CX_RST_CTRL_CX_RST(n)	BIT(4 + (n))
>  #define CPUCFG_CX_RST_CTRL_CORE_RST(n)	BIT(n)
> +#define CPUCFG_CX_RST_CTRL_CORE_RST_ALL	(0xf << 0)
> =20
>  #define PRCM_CPU_PO_RST_CTRL(c)		(0x4 + 0x4 * (c))
>  #define PRCM_CPU_PO_RST_CTRL_CORE(n)	BIT(n)
>  #define PRCM_CPU_PO_RST_CTRL_CORE_ALL	0xf
>  #define PRCM_PWROFF_GATING_REG(c)	(0x100 + 0x4 * (c))
> +/* The power off register for clusters are different from SUN9I and SUN8=
I */
> +#define PRCM_PWROFF_GATING_REG_CLUSTER_SUN8I	BIT(0)
>  #define PRCM_PWROFF_GATING_REG_CLUSTER_SUN9I	BIT(4)
>  #define PRCM_PWROFF_GATING_REG_CORE(n)	BIT(n)
>  #define PRCM_PWR_SWITCH_REG(c, cpu)	(0x140 + 0x10 * (c) + 0x4 * (cpu))
>  #define PRCM_CPU_SOFT_ENTRY_REG		0x164
> =20
> +/* R_CPUCFG registers, specific to SUN8I */
> +#define R_CPUCFG_CLUSTER_PO_RST_CTRL(c)	(0x30 + (c) * 0x4)
> +#define R_CPUCFG_CLUSTER_PO_RST_CTRL_CORE(n)	BIT(n)
> +#define R_CPUCFG_CPU_SOFT_ENTRY_REG	0x01a4
> +
>  #define CPU0_SUPPORT_HOTPLUG_MAGIC0	0xFA50392F
>  #define CPU0_SUPPORT_HOTPLUG_MAGIC1	0x790DCA3A
> =20
>  static void __iomem *cpucfg_base;
> +static void __iomem *r_cpucfg_base;
>  static void __iomem *prcm_base;
>  static void __iomem *sram_b_smp_base;
> +static bool is_sun9i;

Since you always check for that condition to always be false, can't
you do the opposite, ie have it called is_a83t, and verify it to be
true?

>  	/* Set the hardware entry point address */
> -	writel(__pa_symbol(sunxi_mc_smp_secondary_startup),
> -	       prcm_base + PRCM_CPU_SOFT_ENTRY_REG);
> +	if (is_sun9i)
> +		writel(__pa_symbol(sunxi_mc_smp_secondary_startup),
> +		       prcm_base + PRCM_CPU_SOFT_ENTRY_REG);
> +	else
> +		writel(__pa_symbol(sunxi_mc_smp_secondary_startup),
> +		       r_cpucfg_base + R_CPUCFG_CPU_SOFT_ENTRY_REG);

if (is_a83t)
	reg =3D prcm_base + PRCM_CPU_SOFT_ENTRY_REG;
else
	reg =3D r_cpucfg_base + R_CPUCFG_CPU_SOFT_ENTRY_REG;
writel(__pa_symbol(sunxi_mc_smp_secondary_startup), reg);

?

Thanks!
Maxime

--=20
Maxime Ripard, Bootlin (formerly Free Electrons)
Embedded Linux and Kernel engineering
https://bootlin.com

--h6jqcllclooy7hs2
Content-Type: application/pgp-signature; name="signature.asc"

-----BEGIN PGP SIGNATURE-----

iQIzBAABCAAdFiEE0VqZU19dR2zEVaqr0rTAlCFNr3QFAlqQLSgACgkQ0rTAlCFN
r3SefA/+Mf7lEuVAP6ZZ0SMM5TKVTa76Zsl28YLhYNZzB4VJgvO6iklBTFJ6bcLl
qZCG47GAB5oEo2fbmq+jyq/EGMSp6OWj37J91OrWfMQzihKuXwUXTB1umoDxkFTK
W/eYSShf6Xkf459moFlwTVxPgZFnf+dZo6lyjxbEelpzCXBLdF8NBt2ggKSifjFP
kB43opV1SY2fl0AWzSIA+9j1Mf/SfBsiPMjwqWOzeKPY7/vku2Jb2zdhn1tRGmgh
gGD7jK6oZR3fUPgqgLTuPovh0th0ud/gv28B/urOKujaBUrMLDc9t+9RbF0Su/rr
2/MSQEyCcs60HygjKzsVy+aqfJQgfaF3IHY94Z0Iba50B8VU9eeWWN9kZT4KIsuQ
A9S65WNW+40LyZUFpBFVJrwgvbqNogfRcvvJgrZQbuo2m+XXHFkLuzaXLqNYt6aH
rUnT5B9cW1q6yTqNxelF0rwrlbuTCIlJhSR2yalnr3QTialab3yZWijEyjbJmAUd
aS/rNhJGLiZQss/UtihtduH97hqUUMRkJfIMLoAgS1Eeprblek/YJL2VYSALRkSE
eIPYwdnW/tkmHAQOi3GFOLpoJvez9uAGcDXEszdVIZ8RD2Kzs5RgFT+hTfTxojax
3nQ/YxQi5Kq1idUJkpWuZ5kjtTWdJJTdcMzHTKyKpFzrrS107ug=
=5O+N
-----END PGP SIGNATURE-----

--h6jqcllclooy7hs2--