brain-hackers_pepepper-mirror/u-boot-brain
1
0
Fork 0
mirror of https://github.com/brain-hackers/u-boot-brain synced 2024-06-09 23:36:03 +09:00
Code Issues Projects Releases Wiki Activity

psci: rename psci_features function

Browse Source 
s/psci_features/request_psci_features/g for the case when both
ARCH_SUPPORT_PSCI=y and ARM_PSCI_FW=y, that leads to these
compilation issues:

drivers/firmware/psci.c:69:12: error: conflicting types for 'psci_features'
   69 | static int psci_features(u32 psci_func_id)
      |            ^~~~~~~~~~~~~
In file included from drivers/firmware/psci.c:23:
./arch/arm/include/asm/system.h:548:5: note: previous declaration of 'psci_features' was here
  548 | s32 psci_features(u32 function_id, u32 psci_fid);
      |     ^~~~~~~~~~~~~

Tested-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Reported-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Fixes: b7135b034f ("psci: add features/reset2 support")
Signed-off-by: Igor Opaniuk <igor.opaniuk@foundries.io>
This commit is contained in:
Igor Opaniuk 2021-05-06 17:34:27 +03:00 committed by Tom Rini
parent 6c353b34cf
commit eefa9d7f08
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/firmware/psci.c
View File

@ -66,7 +66,7 @@ unsigned long __efi_runtime invoke_psci_fn
return res.a0;
}
static int psci_features(u32 psci_func_id)
static int request_psci_features(u32 psci_func_id)
{
return invoke_psci_fn(PSCI_1_0_FN_PSCI_FEATURES,
psci_func_id, 0, 0);
@ -85,7 +85,8 @@ static bool psci_is_system_reset2_supported(void)
ver = psci_0_2_get_version();
if (PSCI_VERSION_MAJOR(ver) >= 1) {
ret = psci_features(PSCI_FN_NATIVE(1_1, SYSTEM_RESET2));
ret = request_psci_features(PSCI_FN_NATIVE(1_1,
SYSTEM_RESET2));
if (ret != PSCI_RET_NOT_SUPPORTED)
return true;