Djam/u-boot
1
0
Fork 0
mirror of https://github.com/u-boot/u-boot.git synced 2025-04-26 07:17:10 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

armv8: include psci_update_dt() unconditionally

Browse source 
psci_update_dt() is also required if CONFIG_ARMV8_PSCI is set, that is,
if u-boot is the PSCI provider.
Guard the check which is intended to call into the PSCI implementation
in the secure firmware, by the proper macro SEC_FIRMWARE_ARMV8_PSCI.

Mark the function as weak because - unfortunately - there is already
a stub of the same function in arch/arm/mach-rmobile/psci-r8a779a0.c
which does not the same as the common one.

Signed-off-by: Michael Walle <michael@walle.cc>
Reviewed-by: Priyanka Jain <priyanka.jain@nxp.com>
This commit is contained in:
Michael Walle 2022-02-28 13:48:37 +01:00 • committed by Priyanka Jain
parent 881284b36a
commit eb217200ef
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
arch/arm/cpu/armv8/cpu-dt.c
View file

@ -8,9 +8,9 @@
#include <asm/psci.h> #include <asm/psci.h>
#include <asm/system.h> #include <asm/system.h>
#include <asm/armv8/sec_firmware.h> #include <asm/armv8/sec_firmware.h>
#include <linux/libfdt.h>
#if CONFIG_IS_ENABLED(ARMV8_SEC_FIRMWARE_SUPPORT) __weak int psci_update_dt(void *fdt)
int psci_update_dt(void *fdt)
{ {
/* /*
* If the PSCI in SEC Firmware didn't work, avoid to update the * If the PSCI in SEC Firmware didn't work, avoid to update the
@ -18,8 +18,10 @@ int psci_update_dt(void *fdt)
* number to support detecting PSCI dynamically and then switching * number to support detecting PSCI dynamically and then switching
* the SMP boot method between PSCI and spin-table. * the SMP boot method between PSCI and spin-table.
*/ */
if (sec_firmware_support_psci_version() == PSCI_INVALID_VER) if (CONFIG_IS_ENABLED(SEC_FIRMWARE_ARMV8_PSCI) &&
sec_firmware_support_psci_version() == PSCI_INVALID_VER)
return 0; return 0;
fdt_psci(fdt); fdt_psci(fdt);
#if defined(CONFIG_ARMV8_PSCI) && !defined(CONFIG_ARMV8_SECURE_BASE) #if defined(CONFIG_ARMV8_PSCI) && !defined(CONFIG_ARMV8_SECURE_BASE)
@ -30,4 +32,3 @@ int psci_update_dt(void *fdt)
return 0; return 0;
} }
#endif