From: "Mylène Josserand" <mylene.josserand@bootlin.com> To: linux@armlinux.org.uk, maxime.ripard@bootlin.com, 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 Cc: 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, mylene.josserand@bootlin.com Subject: [PATCH v6 11/11] ARM: shmobile: Convert file to use cntvoff Date: Mon, 16 Apr 2018 23:50:32 +0200 [thread overview] Message-ID: <20180416215032.5023-12-mylene.josserand@bootlin.com> (raw) In-Reply-To: <20180416215032.5023-1-mylene.josserand@bootlin.com> 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(-) 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") || -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: mylene.josserand@bootlin.com (Mylène Josserand) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 11/11] ARM: shmobile: Convert file to use cntvoff Date: Mon, 16 Apr 2018 23:50:32 +0200 [thread overview] Message-ID: <20180416215032.5023-12-mylene.josserand@bootlin.com> (raw) In-Reply-To: <20180416215032.5023-1-mylene.josserand@bootlin.com> 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(-) 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") || -- 2.11.0
next prev parent reply other threads:[~2018-04-16 21:52 UTC|newest] Thread overview: 80+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-04-16 21:50 [PATCH v6 00/11] Sunxi: Add SMP support on A83T Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 01/11] ARM: sunxi: smp: Move assembly code into a file Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-17 3:12 ` Chen-Yu Tsai 2018-04-17 3:12 ` Chen-Yu Tsai 2018-04-17 11:17 ` Maxime Ripard 2018-04-17 11:17 ` Maxime Ripard 2018-04-17 11:25 ` Chen-Yu Tsai 2018-04-17 11:25 ` Chen-Yu Tsai 2018-04-18 8:45 ` Maxime Ripard 2018-04-18 8:45 ` Maxime Ripard 2018-04-18 10:05 ` Chen-Yu Tsai 2018-04-18 10:05 ` Chen-Yu Tsai 2018-04-19 6:53 ` Mylène Josserand 2018-04-19 6:53 ` Mylène Josserand 2018-04-17 6:36 ` kbuild test robot 2018-04-17 6:36 ` kbuild test robot 2018-04-17 6:36 ` kbuild test robot 2018-04-17 6:36 ` kbuild test robot 2018-04-17 10:46 ` kbuild test robot 2018-04-17 10:46 ` kbuild test robot 2018-04-17 10:46 ` kbuild test robot 2018-04-17 10:46 ` kbuild test robot 2018-04-16 21:50 ` [PATCH v6 02/11] ARM: dts: sun8i: Add CPUCFG device node for A83T dtsi Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 03/11] ARM: dts: sun8i: Add R_CPUCFG device node for the " Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-17 3:13 ` Chen-Yu Tsai 2018-04-17 3:13 ` Chen-Yu Tsai 2018-04-16 21:50 ` [PATCH v6 04/11] ARM: dts: sun8i: a83t: Add CCI-400 node Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 05/11] ARM: smp: Add initialization of CNTVOFF Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-18 9:30 ` Geert Uytterhoeven 2018-04-18 9:30 ` Geert Uytterhoeven 2018-04-18 10:01 ` Mylène Josserand 2018-04-18 10:01 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 06/11] ARM: sunxi: " Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 07/11] ARM: sun9i: smp: Rename clusters's power-off Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-17 8:21 ` Sergei Shtylyov 2018-04-17 8:21 ` Sergei Shtylyov 2018-04-17 8:21 ` Sergei Shtylyov 2018-04-18 5:51 ` Mylène Josserand 2018-04-18 5:51 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 08/11] ARM: sun9i: smp: Add is_sun8i field Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-17 7:52 ` Maxime Ripard 2018-04-17 7:52 ` Maxime Ripard 2018-04-17 7:57 ` Chen-Yu Tsai 2018-04-17 7:57 ` Chen-Yu Tsai 2018-04-17 11:19 ` Maxime Ripard 2018-04-17 11:19 ` Maxime Ripard 2018-04-16 21:50 ` [PATCH v6 09/11] ARM: sun8i: smp: Add support for A83T Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-17 11:20 ` Maxime Ripard 2018-04-17 11:20 ` Maxime Ripard 2018-04-18 5:46 ` Mylène Josserand 2018-04-18 5:46 ` Mylène Josserand 2018-04-16 21:50 ` [PATCH v6 10/11] ARM: dts: sun8i: Add enable-method for SMP support for the A83T SoC Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand 2018-04-16 21:50 ` Mylène Josserand [this message] 2018-04-16 21:50 ` [PATCH v6 11/11] ARM: shmobile: Convert file to use cntvoff Mylène Josserand 2018-04-18 9:36 ` Geert Uytterhoeven 2018-04-18 9:36 ` Geert Uytterhoeven 2018-04-18 10:03 ` Mylène Josserand 2018-04-18 10:03 ` Mylène Josserand 2018-04-18 13:48 ` Simon Horman 2018-04-18 13:48 ` Simon Horman 2018-04-19 6:40 ` Mylène Josserand 2018-04-19 6:40 ` Mylène Josserand 2018-04-17 2:15 ` [PATCH v6 00/11] Sunxi: Add SMP support on A83T Ondřej Jirman 2018-04-17 2:15 ` Ondřej Jirman 2018-04-17 2:15 ` Ondřej Jirman 2018-04-17 2:15 ` Ondřej Jirman 2018-04-18 5:50 ` Mylène Josserand 2018-04-18 5:50 ` 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=20180416215032.5023-12-mylene.josserand@bootlin.com \ --to=mylene.josserand@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=maxime.ripard@bootlin.com \ --cc=quentin.schulz@bootlin.com \ --cc=robh+dt@kernel.org \ --cc=thomas.petazzoni@bootlin.com \ --cc=wens@csie.org \ /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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.