From: James Morse <james.morse@arm.com> To: linux-arm-kernel@lists.infradead.org Cc: devicetree@vger.kernel.org, Lorenzo Pieralisi <lorenzo.pieralisi@arm.com>, Marc Zyngier <marc.zyngier@arm.com>, Catalin Marinas <catalin.marinas@arm.com>, Will Deacon <will.deacon@arm.com>, Rob Herring <robh+dt@kernel.org>, Loc Ho <lho@apm.com>, Heyi Guo <guoheyi@huawei.com>, kvmarm@lists.cs.columbia.edu Subject: [PATCH v6 13/16] arm64: acpi: Remove __init from acpi_psci_use_hvc() for use by SDEI Date: Mon, 8 Jan 2018 15:38:15 +0000 [thread overview] Message-ID: <20180108153818.22743-14-james.morse@arm.com> (raw) In-Reply-To: <20180108153818.22743-1-james.morse@arm.com> 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(). Signed-off-by: James Morse <james.morse@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> --- The function name is unchanged as this bit is named 'PSCI_USE_HVC' in table 5-37 of ACPIv6.2. arch/arm64/kernel/acpi.c | 2 +- include/linux/psci.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index b3162715ed78..252396a96c78 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -117,7 +117,7 @@ bool __init acpi_psci_present(void) } /* 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; } diff --git a/include/linux/psci.h b/include/linux/psci.h index 6306ab10af18..f724fd8c78e8 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -47,10 +47,11 @@ static inline int psci_dt_init(void) { return 0; } #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) int __init psci_acpi_init(void); bool __init acpi_psci_present(void); -bool __init acpi_psci_use_hvc(void); +bool acpi_psci_use_hvc(void); #else static inline int psci_acpi_init(void) { return 0; } static inline bool acpi_psci_present(void) { return false; } +static inline bool acpi_psci_use_hvc(void) {return false; } #endif #endif /* __LINUX_PSCI_H */ -- 2.15.0
WARNING: multiple messages have this Message-ID (diff)
From: james.morse@arm.com (James Morse) To: linux-arm-kernel@lists.infradead.org Subject: [PATCH v6 13/16] arm64: acpi: Remove __init from acpi_psci_use_hvc() for use by SDEI Date: Mon, 8 Jan 2018 15:38:15 +0000 [thread overview] Message-ID: <20180108153818.22743-14-james.morse@arm.com> (raw) In-Reply-To: <20180108153818.22743-1-james.morse@arm.com> 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(). Signed-off-by: James Morse <james.morse@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com> --- The function name is unchanged as this bit is named 'PSCI_USE_HVC' in table 5-37 of ACPIv6.2. arch/arm64/kernel/acpi.c | 2 +- include/linux/psci.h | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index b3162715ed78..252396a96c78 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -117,7 +117,7 @@ bool __init acpi_psci_present(void) } /* 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; } diff --git a/include/linux/psci.h b/include/linux/psci.h index 6306ab10af18..f724fd8c78e8 100644 --- a/include/linux/psci.h +++ b/include/linux/psci.h @@ -47,10 +47,11 @@ static inline int psci_dt_init(void) { return 0; } #if defined(CONFIG_ARM_PSCI_FW) && defined(CONFIG_ACPI) int __init psci_acpi_init(void); bool __init acpi_psci_present(void); -bool __init acpi_psci_use_hvc(void); +bool acpi_psci_use_hvc(void); #else static inline int psci_acpi_init(void) { return 0; } static inline bool acpi_psci_present(void) { return false; } +static inline bool acpi_psci_use_hvc(void) {return false; } #endif #endif /* __LINUX_PSCI_H */ -- 2.15.0
next prev parent reply other threads:[~2018-01-08 15:38 UTC|newest] Thread overview: 46+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-01-08 15:38 [PATCH v6 00/16] arm64/firmware: Software Delegated Exception Interface James Morse 2018-01-08 15:38 ` James Morse [not found] ` <20180108153818.22743-1-james.morse-5wv7dgnIgG8@public.gmane.org> 2018-01-08 15:38 ` [PATCH v6 01/16] KVM: arm64: Store vcpu on the stack during __guest_enter() James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 02/16] KVM: arm/arm64: Convert kvm_host_cpu_state to a static per-cpu allocation James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 03/16] KVM: arm64: Change hyp_panic()s dependency on tpidr_el2 James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 04/16] arm64: alternatives: use tpidr_el2 on VHE hosts James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 05/16] KVM: arm64: Stop save/restoring host tpidr_el1 on VHE James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 06/16] Docs: dt: add devicetree binding for describing arm64 SDEI firmware James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 07/16] firmware: arm_sdei: Add driver for Software Delegated Exceptions James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 09/16] arm64: uaccess: Add PAN helper James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 10/16] arm64: kernel: Add arch-specific SDEI entry code and CPU masking James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 12/16] firmware: arm_sdei: add support for CPU private events James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 15/16] arm64: mmu: add the entry trampolines start/end section markers into sections.h James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 16/16] arm64: sdei: Add trampoline code for remapping the kernel James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 08/16] arm64: Add vmap_stack header file James Morse 2018-01-08 15:38 ` James Morse 2018-01-08 15:38 ` [PATCH v6 11/16] firmware: arm_sdei: Add support for CPU and system power states James Morse 2018-01-08 15:38 ` James Morse [not found] ` <20180108153818.22743-12-james.morse-5wv7dgnIgG8@public.gmane.org> 2018-01-08 17:22 ` Lorenzo Pieralisi 2018-01-08 17:22 ` Lorenzo Pieralisi 2018-01-13 12:00 ` Catalin Marinas 2018-01-13 12:00 ` Catalin Marinas 2018-01-14 12:20 ` Lorenzo Pieralisi 2018-01-14 12:20 ` Lorenzo Pieralisi 2018-01-17 12:01 ` James Morse 2018-01-17 12:01 ` James Morse 2018-01-08 15:38 ` James Morse [this message] 2018-01-08 15:38 ` [PATCH v6 13/16] arm64: acpi: Remove __init from acpi_psci_use_hvc() for use by SDEI James Morse 2018-01-08 15:51 ` Lorenzo Pieralisi 2018-01-08 15:51 ` Lorenzo Pieralisi 2018-01-08 15:38 ` [PATCH v6 14/16] firmware: arm_sdei: Discover SDEI support via ACPI James Morse 2018-01-08 15:38 ` James Morse [not found] ` <20180108153818.22743-15-james.morse-5wv7dgnIgG8@public.gmane.org> 2018-01-08 17:56 ` Lorenzo Pieralisi 2018-01-08 17:56 ` Lorenzo Pieralisi
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=20180108153818.22743-14-james.morse@arm.com \ --to=james.morse@arm.com \ --cc=catalin.marinas@arm.com \ --cc=devicetree@vger.kernel.org \ --cc=guoheyi@huawei.com \ --cc=kvmarm@lists.cs.columbia.edu \ --cc=lho@apm.com \ --cc=linux-arm-kernel@lists.infradead.org \ --cc=lorenzo.pieralisi@arm.com \ --cc=marc.zyngier@arm.com \ --cc=robh+dt@kernel.org \ --cc=will.deacon@arm.com \ /path/to/YOUR_REPLY https://kernel.org/pub/software/scm/git/docs/git-send-email.html * If your mail client supports setting the In-Reply-To header via mailto: links, try the mailto: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.