LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
From: Maxime Ripard <maxime.ripard@bootlin.com>
To: "Mylène Josserand" <mylene.josserand@bootlin.com>
Cc: linux@armlinux.org.uk, wens@csie.org, marc.zyngier@arm.com,
	mark.rutland@arm.com, robh+dt@kernel.org, horms@verge.net.au,
	geert@linux-m68k.org, magnus.damm@gmail.com,
	linux-renesas-soc@vger.kernel.org, devicetree@vger.kernel.org,
	clabbe.montjoie@gmail.com, quentin.schulz@bootlin.com,
	thomas.petazzoni@bootlin.com,
	linux-arm-kernel@lists.infradead.org,
	linux-kernel@vger.kernel.org
Subject: Re: [PATCH v7 06/11] ARM: sunxi: Add initialization of CNTVOFF
Date: Mon, 23 Apr 2018 10:16:09 +0200	[thread overview]
Message-ID: <20180423081609.dirsitco3aeaqztx@flea> (raw)
In-Reply-To: <20180420211022.11759-7-mylene.josserand@bootlin.com>

[-- Attachment #1: Type: text/plain, Size: 2733 bytes --]

On Fri, Apr 20, 2018 at 11:10:17PM +0200, Mylène Josserand wrote:
> Add the initialization of CNTVOFF for sun8i-a83t.
> 
> For boot CPU, create a new machine that handles this
> function's call in an "init_early" callback. We need to initialize
> CNTVOFF before the arch timer's initialization otherwise, it will
> not be taken into account and fails to boot correctly.
> Because of that, this function can't be called in SMP's early_initcall
> function which is called after timer's init.
> 
> For secondary CPUs, add this function into secondary_startup
> assembly entry.
> 
> Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com>
> ---
>  arch/arm/mach-sunxi/headsmp.S |  1 +
>  arch/arm/mach-sunxi/sunxi.c   | 20 +++++++++++++++++++-
>  2 files changed, 20 insertions(+), 1 deletion(-)
> 
> diff --git a/arch/arm/mach-sunxi/headsmp.S b/arch/arm/mach-sunxi/headsmp.S
> index 37dc772701f3..32d76be98541 100644
> --- a/arch/arm/mach-sunxi/headsmp.S
> +++ b/arch/arm/mach-sunxi/headsmp.S
> @@ -71,6 +71,7 @@ ENDPROC(sunxi_mc_smp_cluster_cache_enable)
>  
>  ENTRY(sunxi_mc_smp_secondary_startup)
>  	bl	sunxi_mc_smp_cluster_cache_enable
> +	bl	secure_cntvoff_init
>  	b	secondary_startup
>  ENDPROC(sunxi_mc_smp_secondary_startup)
>  
> diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
> index 5e9602ce1573..ddc439f6269b 100644
> --- a/arch/arm/mach-sunxi/sunxi.c
> +++ b/arch/arm/mach-sunxi/sunxi.c
> @@ -16,6 +16,7 @@
>  #include <linux/platform_device.h>
>  
>  #include <asm/mach/arch.h>
> +#include <asm/secure_cntvoff.h>
>  
>  static const char * const sunxi_board_dt_compat[] = {
>  	"allwinner,sun4i-a10",
> @@ -62,7 +63,6 @@ MACHINE_END
>  static const char * const sun8i_board_dt_compat[] = {
>  	"allwinner,sun8i-a23",
>  	"allwinner,sun8i-a33",
> -	"allwinner,sun8i-a83t",
>  	"allwinner,sun8i-h2-plus",
>  	"allwinner,sun8i-h3",
>  	"allwinner,sun8i-r40",
> @@ -75,6 +75,24 @@ DT_MACHINE_START(SUN8I_DT, "Allwinner sun8i Family")
>  	.dt_compat	= sun8i_board_dt_compat,
>  MACHINE_END
>  
> +void __init sun8i_cntvoff_init(void)
> +{
> +#ifdef CONFIG_SMP
> +	secure_cntvoff_init();
> +#endif
> +}
> +
> +static const char * const sun8i_cntvoff_board_dt_compat[] = {
> +	"allwinner,sun8i-a83t",
> +	NULL,
> +};
> +
> +DT_MACHINE_START(SUN8I_CNTVOFF_DT, "Allwinner sun8i-a83t board")

This name still doesn't really make much sense. It's an A83t, that's
it.

Apart from the other minor comment I had, and once that name has been
fixed:
Acked-by: Maxime Ripard <maxime.ripard@bootlin.com>

Maxime

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

[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 833 bytes --]

  reply	other threads:[~2018-04-23  8:16 UTC|newest]

Thread overview: 19+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-04-20 21:10 [PATCH v7 00/11] Sunxi: Add SMP support on A83T Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 01/11] ARM: sunxi: smp: Move assembly code into a file Mylène Josserand
2018-04-26 18:25   ` kbuild test robot
2018-04-20 21:10 ` [PATCH v7 02/11] ARM: dts: sun8i: Add CPUCFG device node for A83T dtsi Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 03/11] ARM: dts: sun8i: Add R_CPUCFG device node for the " Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 04/11] ARM: dts: sun8i: a83t: Add CCI-400 node Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 05/11] ARM: smp: Add initialization of CNTVOFF Mylène Josserand
2018-05-08 10:57   ` Russell King - ARM Linux
2018-04-20 21:10 ` [PATCH v7 06/11] ARM: sunxi: " Mylène Josserand
2018-04-23  8:16   ` Maxime Ripard [this message]
2018-04-27  8:25     ` Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 07/11] ARM: sun9i: smp: Rename clusters's power-off Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 08/11] ARM: sun9i: smp: Add is_a83t field Mylène Josserand
2018-04-23  8:14   ` Maxime Ripard
2018-04-27  8:26     ` Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 09/11] ARM: sun8i: smp: Add support for A83T Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 10/11] ARM: dts: sun8i: Add enable-method for SMP support for the A83T SoC Mylène Josserand
2018-04-20 21:10 ` [PATCH v7 11/11] ARM: shmobile: Convert file to use cntvoff Mylène Josserand
2018-04-20 21:59 ` [PATCH v7 00/11] Sunxi: Add SMP support on A83T Mylène Josserand

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20180423081609.dirsitco3aeaqztx@flea \
    --to=maxime.ripard@bootlin.com \
    --cc=clabbe.montjoie@gmail.com \
    --cc=devicetree@vger.kernel.org \
    --cc=geert@linux-m68k.org \
    --cc=horms@verge.net.au \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-renesas-soc@vger.kernel.org \
    --cc=linux@armlinux.org.uk \
    --cc=magnus.damm@gmail.com \
    --cc=marc.zyngier@arm.com \
    --cc=mark.rutland@arm.com \
    --cc=mylene.josserand@bootlin.com \
    --cc=quentin.schulz@bootlin.com \
    --cc=robh+dt@kernel.org \
    --cc=thomas.petazzoni@bootlin.com \
    --cc=wens@csie.org \
    --subject='Re: [PATCH v7 06/11] ARM: sunxi: Add initialization of CNTVOFF' \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).