| Message ID | 20180416215032.5023-12-mylene.josserand@bootlin.com (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Mylène, On Mon, Apr 16, 2018 at 11:50 PM, Mylène Josserand <mylene.josserand@bootlin.com> wrote: > Now that a common function is available for CNTVOFF's > initialization, let's convert shmobile-apmu code to use > this function. Thanks for your patch, works fine on Renesas ALT with R-Car E2, which suffers from lack of CNTVOFF initialization. > Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> Gr{oetje,eeting}s, Geert
Hello, On Wed, 18 Apr 2018 11:36:27 +0200 Geert Uytterhoeven <geert@linux-m68k.org> wrote: > Hi Mylène, > > On Mon, Apr 16, 2018 at 11:50 PM, Mylène Josserand > <mylene.josserand@bootlin.com> wrote: > > Now that a common function is available for CNTVOFF's > > initialization, let's convert shmobile-apmu code to use > > this function. > > Thanks for your patch, works fine on Renesas ALT with R-Car E2, > which suffers from lack of CNTVOFF initialization. Great to know that it works on this board. > > > Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com> > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Gr{oetje,eeting}s, > > Geert > Thank you again for testing it :) Best regards,
On Wed, Apr 18, 2018 at 12:03:27PM +0200, Mylène Josserand wrote: > Hello, > > On Wed, 18 Apr 2018 11:36:27 +0200 > Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > > Hi Mylène, > > > > On Mon, Apr 16, 2018 at 11:50 PM, Mylène Josserand > > <mylene.josserand@bootlin.com> wrote: > > > Now that a common function is available for CNTVOFF's > > > initialization, let's convert shmobile-apmu code to use > > > this function. > > > > Thanks for your patch, works fine on Renesas ALT with R-Car E2, > > which suffers from lack of CNTVOFF initialization. > > Great to know that it works on this board. > > > > > > Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com> > > > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > Gr{oetje,eeting}s, > > > > Geert > > > > Thank you again for testing it :) What is the plan for merging this patch/series? I'd be happy to take this patch through the renesas tree once any dependencies are in place.
Hello Simon, On Wed, 18 Apr 2018 15:48:55 +0200 Simon Horman <horms@verge.net.au> wrote: > On Wed, Apr 18, 2018 at 12:03:27PM +0200, Mylène Josserand wrote: > > Hello, > > > > On Wed, 18 Apr 2018 11:36:27 +0200 > > Geert Uytterhoeven <geert@linux-m68k.org> wrote: > > > > > Hi Mylène, > > > > > > On Mon, Apr 16, 2018 at 11:50 PM, Mylène Josserand > > > <mylene.josserand@bootlin.com> wrote: > > > > Now that a common function is available for CNTVOFF's > > > > initialization, let's convert shmobile-apmu code to use > > > > this function. > > > > > > Thanks for your patch, works fine on Renesas ALT with R-Car E2, > > > which suffers from lack of CNTVOFF initialization. > > > > Great to know that it works on this board. > > > > > > > > > Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com> > > > > > > Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > Tested-by: Geert Uytterhoeven <geert+renesas@glider.be> > > > > > > Gr{oetje,eeting}s, > > > > > > Geert > > > > > > > Thank you again for testing it :) > > What is the plan for merging this patch/series? > > I'd be happy to take this patch through the renesas tree once any > dependencies are in place. I will send a new series before the end of the week to correct the reviews I got so far and I hope that the next one will be merged (otherwise, I will fix what needs to be fixed, of course). Best regards,
diff --git a/arch/arm/mach-shmobile/common.h b/arch/arm/mach-shmobile/common.h index a8fa4f7e1f60..b77ad5b56895 100644 --- a/arch/arm/mach-shmobile/common.h +++ b/arch/arm/mach-shmobile/common.h @@ -2,7 +2,6 @@ #ifndef __ARCH_MACH_COMMON_H #define __ARCH_MACH_COMMON_H -extern void shmobile_init_cntvoff(void); extern void shmobile_init_delay(void); extern void shmobile_boot_vector(void); extern unsigned long shmobile_boot_fn; diff --git a/arch/arm/mach-shmobile/headsmp-apmu.S b/arch/arm/mach-shmobile/headsmp-apmu.S index 5672b5849401..d49ab194766a 100644 --- a/arch/arm/mach-shmobile/headsmp-apmu.S +++ b/arch/arm/mach-shmobile/headsmp-apmu.S @@ -11,29 +11,9 @@ #include <linux/linkage.h> #include <asm/assembler.h> -ENTRY(shmobile_init_cntvoff) - /* - * CNTVOFF has to be initialized either from non-secure Hypervisor - * mode or secure Monitor mode with SCR.NS==1. If TrustZone is enabled - * then it should be handled by the secure code - */ - cps #MON_MODE - mrc p15, 0, r1, c1, c1, 0 /* Get Secure Config */ - orr r0, r1, #1 - mcr p15, 0, r0, c1, c1, 0 /* Set Non Secure bit */ - instr_sync - mov r0, #0 - mcrr p15, 4, r0, r0, c14 /* CNTVOFF = 0 */ - instr_sync - mcr p15, 0, r1, c1, c1, 0 /* Set Secure bit */ - instr_sync - cps #SVC_MODE - ret lr -ENDPROC(shmobile_init_cntvoff) - #ifdef CONFIG_SMP ENTRY(shmobile_boot_apmu) - bl shmobile_init_cntvoff + bl secure_cntvoff_init b secondary_startup ENDPROC(shmobile_boot_apmu) #endif diff --git a/arch/arm/mach-shmobile/setup-rcar-gen2.c b/arch/arm/mach-shmobile/setup-rcar-gen2.c index 5561dbed7a33..4a881026d740 100644 --- a/arch/arm/mach-shmobile/setup-rcar-gen2.c +++ b/arch/arm/mach-shmobile/setup-rcar-gen2.c @@ -26,6 +26,7 @@ #include <linux/of_fdt.h> #include <linux/of_platform.h> #include <asm/mach/arch.h> +#include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h" @@ -70,7 +71,7 @@ void __init rcar_gen2_timer_init(void) void __iomem *base; u32 freq; - shmobile_init_cntvoff(); + secure_cntvoff_init(); if (of_machine_is_compatible("renesas,r8a7745") || of_machine_is_compatible("renesas,r8a7792") ||
Now that a common function is available for CNTVOFF's initialization, let's convert shmobile-apmu code to use this function. Signed-off-by: Mylène Josserand <mylene.josserand@bootlin.com> --- arch/arm/mach-shmobile/common.h | 1 - arch/arm/mach-shmobile/headsmp-apmu.S | 22 +--------------------- arch/arm/mach-shmobile/setup-rcar-gen2.c | 3 ++- 3 files changed, 3 insertions(+), 23 deletions(-)