OSDN Git Service

ARM: mach-shmobile: Don't init CNTVOFF/counter if PSCI is available
authorOleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Wed, 29 May 2019 16:05:00 +0000 (19:05 +0300)
committerSimon Horman <horms+renesas@verge.net.au>
Fri, 31 May 2019 09:38:01 +0000 (11:38 +0200)
commit51a0daf64dee78dacaecc7bec3d36e0b2f49c7a1
tree943770cd24632375da24fe8bc9ef2c5d702a2a02
parenta188339ca5a396acc588e5851ed7e19f66b0ebd9
ARM: mach-shmobile: Don't init CNTVOFF/counter if PSCI is available

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.

Signed-off-by: Oleksandr Tyshchenko <oleksandr_tyshchenko@epam.com>
Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
Signed-off-by: Simon Horman <horms+renesas@verge.net.au>
arch/arm/mach-shmobile/setup-rcar-gen2.c