UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm64: acpi: Remove __init from acpi_psci_use_hvc() for use by SDEI 

SDEI inherits the 'use hvc' bit that is also used by PSCI. PSCI does all
its initialisation early, SDEI does its late.

Remove the __init annotation from acpi_psci_use_hvc().

Acked-by: Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>
Signed-off-by: James Morse <james.morse@arm.com>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>
This commit is contained in:
James Morse 2018-01-08 15:38:15 +00:00 committed by Catalin Marinas
parent f92b5462a2
commit fa31ab77ce
2 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
arch/arm64/kernel/acpi.c
View File

@ -117,7 +117,7 @@ bool __init acpi_psci_present(void)
} }
/* Whether HVC must be used instead of SMC as the PSCI conduit */ /* Whether HVC must be used instead of SMC as the PSCI conduit */
bool __init acpi_psci_use_hvc(void) bool acpi_psci_use_hvc(void)
{ {
return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC; return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;
} }

3
include/linux/psci.h
View File

@ -47,10 +47,11 @@ static inline int psci_dt_init(void) { return 0; }
#if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI)
int __init psci_acpi_init(void); int __init psci_acpi_init(void);
bool __init acpi_psci_present(void); bool __init acpi_psci_present(void);
bool __init acpi_psci_use_hvc(void); bool acpi_psci_use_hvc(void);
#else #else
static inline int psci_acpi_init(void) { return 0; } static inline int psci_acpi_init(void) { return 0; }
static inline bool acpi_psci_present(void) { return false; } static inline bool acpi_psci_present(void) { return false; }
static inline bool acpi_psci_use_hvc(void) {return false; }
#endif #endif
#endif /* __LINUX_PSCI_H */ #endif /* __LINUX_PSCI_H */