[PATCH RESEND v3] arm64: clean the additional checks before calling ghes_notify_sea()
From: Dongjiu Geng <hidden>
Date: 2018-08-11 04:36:41
Also in:
linux-acpi, lkml
Subsystem:
acpi, acpi component architecture (acpica), arm64 port (aarch64 architecture), the rest · Maintainers:
"Rafael J. Wysocki", Saket Dumbre, Catalin Marinas, Will Deacon, Linus Torvalds
In order to remove the additional check before calling the ghes_notify_sea(), make stub definition when !CONFIG_ACPI_APEI_SEA. After this cleanup, we can simply call the ghes_notify_sea() to let APEI driver handle the SEA notification. CC: Tyler Baicar <redacted> CC: James Morse <james.morse@arm.com> Signed-off-by: Dongjiu Geng <redacted> Acked-by: Will Deacon <redacted> Reviewed-by: Tyler Baicar <redacted> --- This cleanup is ever mentioned by Mark Rutland in [1] [1]: https://lkml.org/lkml/2018/5/31/289 change since v2: 1. Add 'Reviewed-by' of Tyler change since v1: 1. Update the commit messages 2. CC Tyler and James 3. Add 'Acked-by' of Will --- arch/arm64/mm/fault.c | 7 +------ include/acpi/ghes.h | 4 ++++ 2 files changed, 5 insertions(+), 6 deletions(-)
diff --git a/arch/arm64/mm/fault.c b/arch/arm64/mm/fault.c
index b8eecc7..9ffe01d 100644
--- a/arch/arm64/mm/fault.c
+++ b/arch/arm64/mm/fault.c@@ -727,12 +727,7 @@ static int do_sea(unsigned long addr, unsigned int esr, struct pt_regs *regs) int handle_guest_sea(phys_addr_t addr, unsigned int esr) { - int ret = -ENOENT; - - if (IS_ENABLED(CONFIG_ACPI_APEI_SEA)) - ret = ghes_notify_sea(); - - return ret; + return ghes_notify_sea(); } asmlinkage void __exception do_mem_abort(unsigned long addr, unsigned int esr,
diff --git a/include/acpi/ghes.h b/include/acpi/ghes.h
index 1624e2b..82cb4eb 100644
--- a/include/acpi/ghes.h
+++ b/include/acpi/ghes.h@@ -118,6 +118,10 @@ static inline void *acpi_hest_get_next(struct acpi_hest_generic_data *gdata) (void *)section - (void *)(estatus + 1) < estatus->data_length; \ section = acpi_hest_get_next(section)) +#ifdef CONFIG_ACPI_APEI_SEA int ghes_notify_sea(void); +#else +static inline int ghes_notify_sea(void) { return -ENOENT; } +#endif #endif /* GHES_H */
--
1.9.1