Subject: [PATCHv2 08/12] arm64: psci: remove ACPI coupling

From: [email-masked] (Hanjun Guo)
Date: Tue, 19 May 2015 16:40:35 +0800

On 2015?05?18? 18:38, Mark Rutland wrote:
> The 32-bit ARM port doesn't have ACPI headers, and conditionally
> including them is going to look horrendous. In preparation for sharing
> the PSCI invocation code with 32-bit, move the acpi_psci_* function
> declarations and definitions such that the PSCI client code need not
> include ACPI headers.
>
> While it would seem like we could simply hide the ACPI includes in
> psci.h, the ACPI headers have hilarious circular dependencies which make
> this infeasible without reorganising most of ACPICA. So rather than
> doing that, move the acpi_psci_* prototypes into psci.h.
>
> The psci_acpi_init function is made dependent on CONFIG_ACPI (with a
> stub implementation in asm/psci.h) such that it need not be built for
> 32-bit ARM or kernels without ACPI support. The currently missing __init
> annotations are added to the prototypes in the header.
>
> Signed-off-by: Mark Rutland <[email-masked]>
> Reviewed-by: Ashwin Chaugule <[email-masked]>
> Cc: Al Stone <[email-masked]>
> Cc: Catalin Marinas <[email-masked]>
> Cc: Hanjun Guo <[email-masked]>
> Cc: Lorenzo Pieralisi <[email-masked]>
> Cc: Will Deacon <[email-masked]>
> ---
>   arch/arm64/include/asm/acpi.h | 14 --------------
>   arch/arm64/include/asm/psci.h | 11 +++++++++--
>   arch/arm64/kernel/acpi.c      | 11 +++++++++++
>   arch/arm64/kernel/psci.c      |  4 ++--
>   4 files changed, 22 insertions(+), 18 deletions(-)
>
> diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
> index 59c05d8..b0fecad 100644
> --- a/arch/arm64/include/asm/acpi.h
> +++ b/arch/arm64/include/asm/acpi.h
> @@ -39,18 +39,6 @@ extern int acpi_disabled;
>   extern int acpi_noirq;
>   extern int acpi_pci_disabled;
>
> -/* 1 to indicate PSCI 0.2+ is implemented */
> -static inline bool acpi_psci_present(void)
> -{
> -	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_COMPLIANT;
> -}
> -
> -/* 1 to indicate HVC must be used instead of SMC as the PSCI conduit */
> -static inline bool acpi_psci_use_hvc(void)
> -{
> -	return acpi_gbl_FADT.arm_boot_flags & ACPI_FADT_PSCI_USE_HVC;
> -}
> -
>   static inline void disable_acpi(void)
>   {
>   	acpi_disabled = 1;
> @@ -88,8 +76,6 @@ static inline void arch_fix_phys_package_id(int num, u32 slot) { }
>   void __init acpi_init_cpus(void);
>
>   #else
> -static inline bool acpi_psci_present(void) { return false; }
> -static inline bool acpi_psci_use_hvc(void) { return false; }
>   static inline void acpi_init_cpus(void) { }
>   #endif /* CONFIG_ACPI */
>
> diff --git a/arch/arm64/include/asm/psci.h b/arch/arm64/include/asm/psci.h
> index 2454bc5..b5d4c1d 100644
> --- a/arch/arm64/include/asm/psci.h
> +++ b/arch/arm64/include/asm/psci.h
> @@ -14,7 +14,14 @@
>   #ifndef __ASM_PSCI_H
>   #define __ASM_PSCI_H
>
> -int psci_dt_init(void);
> -int psci_acpi_init(void);
> +int __init psci_dt_init(void);
> +
> +#ifdef CONFIG_ACPI
> +int __init psci_acpi_init(void);
> +bool __init acpi_psci_present(void);
> +bool __init acpi_psci_use_hvc(void);

really some nit, do we need __init for function declaration?

other than that,

Acked-by: Hanjun Guo <[email-masked]>