From: hanjun.guo@linaro•org (Hanjun Guo)
To: linux-arm-kernel@lists•infradead.org
Subject: [PATCHv2 08/12] arm64: psci: remove ACPI coupling
Date: Tue, 19 May 2015 16:40:35 +0800 [thread overview]
Message-ID: <555AF703.4050702@linaro.org> (raw)
In-Reply-To: <1431945503-6939-9-git-send-email-mark.rutland@arm.com>
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 <mark.rutland@arm•com>
> Reviewed-by: Ashwin Chaugule <ashwin.chaugule@linaro•org>
> Cc: Al Stone <al.stone@linaro•org>
> Cc: Catalin Marinas <catalin.marinas@arm•com>
> Cc: Hanjun Guo <hanjun.guo@linaro•org>
> Cc: Lorenzo Pieralisi <lorenzo.pieralisi@arm•com>
> Cc: Will Deacon <will.deacon@arm•com>
> ---
> 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 <hanjun.guo@linaro•org>
next prev parent reply other threads:[~2015-05-19 8:40 UTC|newest]
Thread overview: 43+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-05-18 10:38 [PATCHv2 00/12] arm/arm64: Unify PSCI client support Mark Rutland
2015-05-18 10:38 ` [PATCHv2 01/12] arm/arm64: kvm: add missing PSCI include Mark Rutland
2015-05-19 3:37 ` Hanjun Guo
2015-05-18 10:38 ` [PATCHv2 02/12] arm64: smp_plat: add get_logical_index Mark Rutland
2015-05-18 17:09 ` Catalin Marinas
2015-05-18 17:55 ` Mark Rutland
2015-05-19 3:47 ` Hanjun Guo
2015-05-19 8:31 ` Catalin Marinas
2015-05-19 9:10 ` Mark Rutland
2015-05-18 10:38 ` [PATCHv2 03/12] arm64: smp: consistently use error codes Mark Rutland
2015-05-18 17:21 ` Catalin Marinas
2015-05-19 8:17 ` Hanjun Guo
2015-05-18 10:38 ` [PATCHv2 04/12] arm64: psci: remove unnecessary id indirection Mark Rutland
2015-05-18 17:28 ` Catalin Marinas
2015-05-19 8:21 ` Hanjun Guo
2015-05-18 10:38 ` [PATCHv2 05/12] arm64: psci: support unsigned return values Mark Rutland
2015-05-18 17:29 ` Catalin Marinas
2015-05-19 8:25 ` Hanjun Guo
2015-05-18 10:38 ` [PATCHv2 06/12] arm64: psci: account for Trusted OS instances Mark Rutland
2015-05-18 17:33 ` Catalin Marinas
2015-05-18 10:38 ` [PATCHv2 07/12] arm64: psci: kill psci_power_state Mark Rutland
2015-05-18 17:36 ` Catalin Marinas
2015-05-18 18:11 ` Mark Rutland
2015-05-18 10:38 ` [PATCHv2 08/12] arm64: psci: remove ACPI coupling Mark Rutland
2015-05-18 17:38 ` Catalin Marinas
2015-05-19 8:40 ` Hanjun Guo [this message]
2015-05-19 9:18 ` Mark Rutland
2015-05-18 10:38 ` [PATCHv2 09/12] arm64: psci: factor invocation code to drivers Mark Rutland
2015-05-18 17:40 ` Catalin Marinas
2015-05-19 8:46 ` Hanjun Guo
2015-05-18 10:38 ` [PATCHv2 10/12] drivers: psci: support native SMC{32,64} calls Mark Rutland
2015-05-18 17:43 ` Catalin Marinas
2015-05-18 17:49 ` Mark Rutland
2015-05-18 10:38 ` [PATCHv2 11/12] ARM: migrate to common PSCI client code Mark Rutland
2015-05-18 17:45 ` Catalin Marinas
2015-05-18 10:38 ` [PATCHv2 12/12] MAINTAINERS: add PSCI entry Mark Rutland
2015-05-18 17:45 ` Catalin Marinas
2015-05-18 17:49 ` [PATCHv2 00/12] arm/arm64: Unify PSCI client support Catalin Marinas
2015-05-19 9:03 ` Lorenzo Pieralisi
2015-05-19 9:32 ` Mark Rutland
2015-05-19 15:20 ` Catalin Marinas
2015-05-19 8:54 ` Hanjun Guo
2015-05-19 9:33 ` Mark Rutland
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=555AF703.4050702@linaro.org \
--to=hanjun.guo@linaro$(echo .)org \
--cc=linux-arm-kernel@lists$(echo .)infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox