Skip to contentSkip to conversation

ARM: mach-shmobile: Don't init CNTVOFF/counter if PSCI is available

PATCH Superseded Oleksandr Tyshchenko 3 participants 6 messages May 17, 2019 – May 28, 2019

Subsystems (3)

v5 of 6 Superseded Latest is v6 →

lore
Share & tools
lore
#0 lore raw

PATCH v5 1/1 ARM: mach-shmobile: Don't init CNTVOFF/counter 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 and updating counter module before switching to non-secure mode and we don't need to.

As the psci_smp_available() helper always returns false if CONFIG_SMP is disabled, it can't be used safely as an indicator of PSCI usage. For that reason, we check for the mandatory PSCI operation to be available.

Please note, an extra check to prevent secure_cntvoff_init() from being called for secondary CPUs in headsmp-apmu.S is not needed, as SMP code for APMU based system is not executed if PSCI is in use.

---
You can find previous discussions here:

   [v1]  https://lkml.org/lkml/2019/4/17/810
   [v2]  https://lkml.org/lkml/2019/5/3/338
   [v3]  https://lkml.org/lkml/2019/5/10/415

[RFC] https://lkml.org/lkml/2019/5/10/473
[v4] https://lkml.org/lkml/2019/5/14/550

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()

Changes in v3:
- Don't check for the presence of Xen

Changes in v4:
- Don't use psci_smp_available() helper, check for psci_ops.cpu_on directly
- Skip updating counter module if PSCI is available

Changes in v5:
- Check for psci_ops.cpu_on if CONFIG_ARM_PSCI_FW is defined

---
 arch/arm/mach-shmobile/setup-rcar-gen2.c | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
arch/arm/mach-shmobile/setup-rcar-gen2.c +17 -0
index eea60b2..0eeca49b 100644
@@ -17,6 +17,7 @@
 #include <linux/of.h>
 #include <linux/of_fdt.h>
 #include <linux/of_platform.h>
+#include <linux/psci.h>
 #include <asm/mach/arch.h>
 #include <asm/secure_cntvoff.h>
 #include "common.h"
@@ -62,6 +63,21 @@ void __init rcar_gen2_timer_init(void)
 {
 	void __iomem *base;
 	u32 freq;
+	bool need_update = true;
+
+	/*
+	 * 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
+	 * and updating counter module before switching to non-secure mode
+	 * and we don't need to.
+	 */
+#if defined(CONFIG_ARM_PSCI_FW)
+	if (psci_ops.cpu_on)
+		need_update = false;
+#endif
+
+	if (need_update == false)
+		goto skip_update;
 
 	secure_cntvoff_init();
 
@@ -102,6 +118,7 @@ void __init rcar_gen2_timer_init(void)
 
 	iounmap(base);
 
+skip_update:
 	of_clk_init(NULL);
 	timer_probe();
 }
Signature · 1 line
2.7.4
author
#1 lore raw

Hello, all

Gentle reminder...

Signature · 3 lines
Regards,

Oleksandr Tyshchenko
Reviewed-by on v5 1/1
#2 lore raw
In reply to Oleksandr Tyshchenko

Hi Oleksandr,

Quoted 12 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 and updating counter module before switching to non-secure mode and we don't need to.

As the psci_smp_available() helper always returns false if CONFIG_SMP is disabled, it can't be used safely as an indicator of PSCI usage. For that reason, we check for the mandatory PSCI operation to be available.

Quoted 8 lines

Please note, an extra check to prevent secure_cntvoff_init() from being called for secondary CPUs in headsmp-apmu.S is not needed, as SMP code for APMU based system is not executed if PSCI is in use.

Changes in v5:
- Check for psci_ops.cpu_on if CONFIG_ARM_PSCI_FW is defined

Thanks for the update!

Two cosmetic comments below. I'll leave it to Simon to ignore them for applying ;-)

arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 66

Quoted 5 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +1 -0
@@ -62,6 +63,21 @@ void __init rcar_gen2_timer_init(void)
 {
        void __iomem *base;
        u32 freq;
+       bool need_update = true;

Some people like reverse Xmas tree declaration order...

arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 74

Quoted 8 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +8 -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
+        * and updating counter module before switching to non-secure mode
+        * and we don't need to.
+        */
+#if defined(CONFIG_ARM_PSCI_FW)

#ifdef CONFIG_ARM_PSCI_FW ?

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
author
#3 lore raw
Quoted 1 line · Geert Uytterhoeven

Hi Oleksandr,

Hi Geert, all

Quoted 3 lines

Thanks for the update!

Thank you for review!

Just FYI:

Required support for Gen2 Stout board has been already added to Xen [1].

What needs to be done next is to add support for handling device-tree nodes with "interrupts-extended" property in Xen [2]. This is related to Gen3 as well.

[1] https://www.mail-archive.com/[email protected]/msg44386.html

[2] https://www.mail-archive.com/[email protected]/msg45951.html

Quoted 25 lines

Two cosmetic comments below. I'll leave it to Simon to ignore them for applying ;-)

arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 66

Quoted 5 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +1 -0
@@ -62,6 +63,21 @@ void __init rcar_gen2_timer_init(void)
  {
         void __iomem *base;
         u32 freq;
+       bool need_update = true;

Some people like reverse Xmas tree declaration order...

arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 74

Quoted 8 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +8 -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
+        * and updating counter module before switching to non-secure mode
+        * and we don't need to.
+        */
+#if defined(CONFIG_ARM_PSCI_FW)

#ifdef CONFIG_ARM_PSCI_FW ?

Gr{oetje,eeting}s,

Geert

Signature · 3 lines
Regards,

Oleksandr Tyshchenko
#4 lore raw
In reply to Geert Uytterhoeven
Quoted 25 lines · Geert Uytterhoeven

Hi Oleksandr,

Quoted 12 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 and updating counter module before switching to non-secure mode and we don't need to.

As the psci_smp_available() helper always returns false if CONFIG_SMP is disabled, it can't be used safely as an indicator of PSCI usage. For that reason, we check for the mandatory PSCI operation to be available.

Quoted 8 lines

Please note, an extra check to prevent secure_cntvoff_init() from being called for secondary CPUs in headsmp-apmu.S is not needed, as SMP code for APMU based system is not executed if PSCI is in use.

Changes in v5:
- Check for psci_ops.cpu_on if CONFIG_ARM_PSCI_FW is defined

Quoted 6 lines

Thanks for the update!

Two cosmetic comments below. I'll leave it to Simon to ignore them for applying ;-)

Oleksandr, could I trouble you to respin with the
changes suggested by Geert?

Quoted 31 lines

arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 66

Quoted 6 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +1 -0
@@ -62,6 +63,21 @@ void __init rcar_gen2_timer_init(void)
 {
        void __iomem *base;
        u32 freq;
+       bool need_update = true;

Some people like reverse Xmas tree declaration order...

arch/arm/mach-shmobile/setup-rcar-gen2.c void __init rcar_gen2_timer_init(void) · line 74

Quoted 8 lines
arch/arm/mach-shmobile/setup-rcar-gen2.c +8 -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
+        * and updating counter module before switching to non-secure mode
+        * and we don't need to.
+        */
+#if defined(CONFIG_ARM_PSCI_FW)

#ifdef CONFIG_ARM_PSCI_FW ?

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
author
#5 lore raw
Quoted 2 lines

Oleksandr, could I trouble you to respin with the
changes suggested by Geert?

Hi, Simon.

Sure, will send an updated patch tomorrow.

Quoted 1 line
Signature · 3 lines
Regards,

Oleksandr Tyshchenko