| Message ID | 20180420211022.11759-7-mylene.josserand@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
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
Hello Maxime, Thanks for your review. On Mon, 23 Apr 2018 10:16:09 +0200 Maxime Ripard <maxime.ripard@bootlin.com> wrote: > 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. True, I forgot this one, sorry. > > Apart from the other minor comment I had, and once that name has been > fixed: > Acked-by: Maxime Ripard <maxime.ripard@bootlin.com> > > Maxime > Thank you! Best regards,
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") + .init_early = sun8i_cntvoff_init, + .init_time = sun6i_timer_init, + .dt_compat = sun8i_cntvoff_board_dt_compat, +MACHINE_END + static const char * const sun9i_board_dt_compat[] = { "allwinner,sun9i-a80", NULL,
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(-)