ARM: mach-shmobile: Don't init CNTVOFF if PSCI is available
Subsystems (3)
PATCH v2 1/1 ARM: mach-shmobile: Don't init CNTVOFF if PSCI is available
From: Oleksandr Tyshchenko <[email protected]>
If PSCI is available then most likely we are running on PSCI-enabled U-Boot which, we assume, has already taken care of resetting CNTVOFF before switching to non-secure mode and we don't need to.
Also, don't init CNTVOFF if we are running on top of Xen hypervisor, as CNTVOFF is controlled by hypervisor itself and shouldn't be touched by Dom0 in such case.
---
You can find previous discussion here:
https://lkml.org/lkml/2019/4/17/810
Changes in v2:
- Clarify patch subject/description
- Don't use CONFIG_ARM_PSCI option, check whether the PSCI is available, by using psci_smp_available()
- Check whether we are running on top of Xen, by using xen_domain()
--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)
arch/arm/mach-shmobile/setup-rcar-gen2.c +12 -1
@@ -17,7 +17,9 @@#include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <xen/xen.h> #include <asm/mach/arch.h> +#include <asm/psci.h> #include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h"
@@ -63,7 +65,16 @@ void __init rcar_gen2_timer_init(void)void __iomem *base;u32 freq; -secure_cntvoff_init (); +/* +* If PSCI is available then most likely we are running on PSCI-enabled +* U-Boot which, we assume, has already taken care of resetting CNTVOFF +* before switching to non-secure mode and we don't need to. +* Another check is to be sure that we are not running on top of Xen +* hypervisor, as CNTVOFF is controlled by hypervisor itself and +* shouldn't be touched by Dom0 in such case. +*/ +if (!psci_smp_available () && !xen_domain ()) +secure_cntvoff_init (); if (of_machine_is_compatible("renesas,r8a7745") || of_machine_is_compatible("renesas,r8a77470") ||
Signature · 1 line
2.7.4
Hi Oleksandr,
Quoted 6 lines · Oleksandr Tyshchenko
From: Oleksandr Tyshchenko <[email protected]>
If PSCI is available then most likely we are running on PSCI-enabled U-Boot which, we assume, has already taken care of resetting CNTVOFF before switching to non-secure mode and we don't need to.
Quoted 6 lines
Also, don't init CNTVOFF if we are running on top of Xen hypervisor, as CNTVOFF is controlled by hypervisor itself and shouldn't be touched by Dom0 in such case.
Signed-off-by Oleksandr Tyshchenko <[email protected]>CC Julien Grall <[email protected]>
Thanks for your patch!
Quoted 35 lines
---
You can find previous discussion here:
https://lkml.org/lkml/2019/4/17/810Changes in v2:
- Clarify patch subject/description
- Don't useCONFIG_ARM_PSCIoption, check whether the PSCI is available, by usingpsci_smp_available()
- Check whether we are running on top of Xen, by usingxen_domain()--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +5
-1@@ -17,7 +17,9 @@#include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <xen/xen.h> #include <asm/mach/arch.h> +#include <asm/psci.h> #include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h" @@ -63,7 +65,16 @@ void __init rcar_gen2_timer_init(void)void __iomem *base;u32 freq; -secure_cntvoff_init (); +/* +* If PSCI is available then most likely we are running on PSCI-enabled +* U-Boot which, we assume, has already taken care of resetting CNTVOFF
arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 80
Quoted 10 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +7
-0+* before switching to non-secure mode and we don't need to. +* Another check is to be sure that we are not running on top of Xen +* hypervisor, as CNTVOFF is controlled by hypervisor itself and +* shouldn't be touched by Dom0 in such case. +*/ +if (!psci_smp_available () && !xen_domain ()) +secure_cntvoff_init (); if (of_machine_is_compatible("renesas,r8a7745") || of_machine_is_compatible("renesas,r8a77470") ||
How do you prevent secure_cntvoff_init() from being called for secondary CPUs in arch/arm/mach-shmobile/headsmp-apmu.S?
With PSCI, it is not called if "enable-method" in DT is "psci"', so that case is covered, I guess.
What about XEN? Do you override the "enable-method"? If yes, perhaps a check for "renesas,apmu" is more appropriate?
Gr{oetje,eeting}s,
Geert
Signature · 5 lines
Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- [email protected] In personal conversations with technical people, I call myself a hacker. But when I'm talking to journalists I just say "programmer" or something like that. -- Linus Torvalds
Quoted 1 line · Geert Uytterhoeven
Hi Oleksandr,
Hi Geert
Quoted 8 lines · Oleksandr Tyshchenko
Quoted 6 lines
From: Oleksandr Tyshchenko <[email protected]>
If PSCI is available then most likely we are running on PSCI-enabled U-Boot which, we assume, has already taken care of resetting CNTVOFF before switching to non-secure mode and we don't need to.
Quoted 7 lines
Quoted 6 lines
Also, don't init CNTVOFF if we are running on top of Xen hypervisor, as CNTVOFF is controlled by hypervisor itself and shouldn't be touched by Dom0 in such case.
Signed-off-by Oleksandr Tyshchenko <[email protected]>CC Julien Grall <[email protected]>Thanks for your patch!
Thank you for review!
Quoted 44 lines
Quoted 44 lines
---
You can find previous discussion here:
https://lkml.org/lkml/2019/4/17/810Changes in v2:
- Clarify patch subject/description
- Don't useCONFIG_ARM_PSCIoption, check whether the PSCI is available, by usingpsci_smp_available()
- Check whether we are running on top of Xen, by usingxen_domain()--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +12
-1@@ -17,7 +17,9 @@#include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <xen/xen.h> #include <asm/mach/arch.h> +#include <asm/psci.h> #include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h" @@ -63,7 +65,16 @@ void __init rcar_gen2_timer_init(void)void __iomem *base;u32 freq; -secure_cntvoff_init (); +/* +* If PSCI is available then most likely we are running on PSCI-enabled +* U-Boot which, we assume, has already taken care of resetting CNTVOFF +* before switching to non-secure mode and we don't need to. +* Another check is to be sure that we are not running on top of Xen +* hypervisor, as CNTVOFF is controlled by hypervisor itself and +* shouldn't be touched by Dom0 in such case. +*/ +if (!psci_smp_available () && !xen_domain ()) +secure_cntvoff_init ();
Quoted 4 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 80
Quoted 2 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +0
-0if (of_machine_is_compatible("renesas,r8a7745") || of_machine_is_compatible("renesas,r8a77470") ||How do you prevent
secure_cntvoff_init()from being called for secondary CPUs inarch/arm/mach-shmobile/headsmp-apmu.S?
Good question.
Quoted 3 lines
With PSCI, it is not called if "enable-method" in DT is "psci"', so that case is covered, I guess.
Yes.
Quoted 3 lines
What about XEN? Do you override the "enable-method"? If yes, perhaps a check for "renesas,apmu" is more appropriate?
No, I don't override.
The correct way to run Xen would be to use PSCI, so Linux shouldn't do any platform low level operation with secondary CPU cores (on/off, reset, etc) by itself when running on top of Xen hypervisor.
As Xen brings available secondary cores up before starting first domain (Dom0) using PSCI CPU_ON call to FW, and these cores are entered Xen in Hyp mode, so any attempts from Dom0 to perform CPU power management directly (using APMU, RST, etc) may result in something not good. I think that in case when someone wants to run Xen on R-Car Gen2 system (which is SMP) without PSCI enabled, we need to forbid even trying to start secondary cores using APMU.
What do you think?
Quoted 5 lines
Gr{oetje,eeting}s,
Geert
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Hi Oleksandr,
Quoted 42 lines · Oleksandr Tyshchenko
From: Oleksandr Tyshchenko <[email protected]>
If PSCI is available then most likely we are running on PSCI-enabled U-Boot which, we assume, has already taken care of resetting CNTVOFF before switching to non-secure mode and we don't need to.
Also, don't init CNTVOFF if we are running on top of Xen hypervisor, as CNTVOFF is controlled by hypervisor itself and shouldn't be touched by Dom0 in such case.
Signed-off-by Oleksandr Tyshchenko <[email protected]>CC Julien Grall <[email protected]>---
You can find previous discussion here:
https://lkml.org/lkml/2019/4/17/810Changes in v2:
- Clarify patch subject/description
- Don't useCONFIG_ARM_PSCIoption, check whether the PSCI is available, by usingpsci_smp_available()
- Check whether we are running on top of Xen, by usingxen_domain()--- arch/arm/mach-shmobile/setup-rcar-gen2.c | 13 ++++++++++++- 1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +2
-0@@ -17,7 +17,9 @@#include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <xen/xen.h> #include <asm/mach/arch.h> +#include <asm/psci.h> #include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h" @@ -63,7 +65,16 @@ void __init rcar_gen2_timer_init(void)void __iomem *base;
arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 74
Quoted 10 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +7
-1u32 freq; -secure_cntvoff_init (); +/* +* If PSCI is available then most likely we are running on PSCI-enabled +* U-Boot which, we assume, has already taken care of resetting CNTVOFF +* before switching to non-secure mode and we don't need to. +* Another check is to be sure that we are not running on top of Xen +* hypervisor, as CNTVOFF is controlled by hypervisor itself and +* shouldn't be touched by Dom0 in such case.
If you are running on top of Xen, then PSCI will be available. So is there any real value to check the presence of Xen as well?
Cheers,
Signature · 1 line
Julien Grall
Quoted 1 line · Julien Grall
Hi Oleksandr,
Hi Julien
Quoted 26 lines
Quoted 26 lines
---
arch/arm/mach-shmobile/setup-rcar-gen2.c| 13 ++++++++++++-1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +4
-0@@ -17,7 +17,9 @@ #include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <xen/xen.h> #include <asm/mach/arch.h> +#include <asm/psci.h> #include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h"@@ -63,7 +65,16 @@ void __init rcar_gen2_timer_init(void) void __iomem *base; u32 freq; - secure_cntvoff_init(); + /* +* If PSCI is available then most likely we are running on PSCI-enabled
+ * U-Boot which, we assume, has already taken care of resetting
Quoted 8 lines
Quoted 6 lines
CNTVOFF
+ * before switching to non-secure mode and we don't need to. + * Another check is to be sure that we are not running on top of Xen
+ * hypervisor, as CNTVOFF is controlled by hypervisor itself and + * shouldn't be touched by Dom0 in such case.If you are running on top of Xen, then PSCI will be available. So is there any real value to check the presence of Xen as well?
I think, no. If the PSCI is a must to run Xen, then it is certainly an excessive check. I will drop it in V3.
Quoted 3 lines
Cheers,
Signature · 3 lines
Regards, Oleksandr Tyshchenko
Quoted 39 lines · Oleksandr
Quoted 1 line · Julien Grall
Hi Oleksandr,
Hi Julien
Quoted 23 lines
Quoted 23 lines
---
arch/arm/mach-shmobile/setup-rcar-gen2.c| 13 ++++++++++++-1 file changed, 12 insertions(+), 1 deletion(-)arch/arm/mach-shmobile/setup-rcar-gen2.c +3
-0@@ -17,7 +17,9 @@ #include <linux/of.h> #include <linux/of_fdt.h> #include <linux/of_platform.h> +#include <xen/xen.h> #include <asm/mach/arch.h> +#include <asm/psci.h> #include <asm/secure_cntvoff.h> #include "common.h" #include "rcar-gen2.h"@@ -63,7 +65,16 @@ void __init rcar_gen2_timer_init(void) void __iomem *base; u32 freq; - secure_cntvoff_init(); + /*Quoted 8 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 74
Quoted 6 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +6
-0+ * If PSCI is available then most likely we are running on PSCI-enabled + * U-Boot which, we assume, has already taken care of resetting CNTVOFF + * before switching to non-secure mode and we don't need to. + * Another check is to be sure that we are not running on top of Xen + * hypervisor, as CNTVOFF is controlled by hypervisor itself and + * shouldn't be touched by Dom0 in such case.If you are running on top of Xen, then PSCI will be available. So is there any real value to check the presence of Xen as well?
Quoted 1 line
I think, no. If the PSCI is a must to run Xen, then it is certainly an excessive check. I will drop it in V3.
Xen does not offer another interface for SMP bring-up.
Cheers,
Signature · 1 line
Julien Grall