On an ACPI system, ACPI is initialised very early from a
subsys_initcall(), while SDEI is not ready until a subsys_initcall().
More seriously, the kernel is able to handle and report errors until the
GHES is initialised by device_initcall().
Consequently, when an error occurs during the kernel booting, the
phyiscal sdei dispatcher in firmware fails to dispatch error events. All
errors that occurred before GHES initialization are missed and there is
no chance to report and find them again.
In this patch, move sdei_init and ghes_init as far ahead as possible,
right after acpi_hest_init().
Signed-off-by: Shuai Xue <xueshuai@xxxxxxxxxxxxxxxxx>
---
drivers/acpi/apei/ghes.c | 3 +--
drivers/acpi/pci_root.c | 2 ++
drivers/firmware/arm_sdei.c | 9 +--------
include/acpi/apei.h | 2 ++
4 files changed, 6 insertions(+), 10 deletions(-)
diff --git a/drivers/acpi/apei/ghes.c b/drivers/acpi/apei/ghes.c
index c60961d31213..bf0177f44dfd 100644
--- a/drivers/acpi/apei/ghes.c
+++ b/drivers/acpi/apei/ghes.c
@@ -1452,7 +1452,7 @@ static struct platform_driver ghes_platform_driver = {
.remove = ghes_remove,
};
-static int __init ghes_init(void)
+int __init ghes_init(void)
{
int rc;
@@ -1494,4 +1494,3 @@ static int __init ghes_init(void)
err:
return rc;
}
-device_initcall(ghes_init);
diff --git a/drivers/acpi/pci_root.c b/drivers/acpi/pci_root.c
index 81cc18f39cc8..d9bbb6b8340e 100644
--- a/drivers/acpi/pci_root.c
+++ b/drivers/acpi/pci_root.c
@@ -977,6 +977,8 @@ struct pci_bus *acpi_pci_root_create(struct acpi_pci_root *root,
void __init acpi_pci_root_init(void)
{
acpi_hest_init();
+ sdei_init();
+ ghes_init();
if (acpi_pci_disabled)
return;
diff --git a/drivers/firmware/arm_sdei.c b/drivers/firmware/arm_sdei.c
index 198151ca471d..604063d6f542 100644
--- a/drivers/firmware/arm_sdei.c
+++ b/drivers/firmware/arm_sdei.c
@@ -1089,7 +1089,7 @@ static bool __init sdei_present_acpi(void)
return true;
}
-static int __init sdei_init(void)
+int __init sdei_init(void)
{
struct platform_device *pdev;
int ret;
@@ -1110,13 +1110,6 @@ static int __init sdei_init(void)
return ret;
}
-/*
- * On an ACPI system SDEI needs to be ready before HEST:GHES tries to register
- * its events. ACPI is initialised from a subsys_initcall(), GHES is initialised
- * by device_initcall(). We want to be called in the middle.
- */
-subsys_initcall_sync(sdei_init);
-
int sdei_event_handler(struct pt_regs *regs,
struct sdei_registered_event *arg)
{
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index 680f80960c3d..5e6187ca5621 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -33,6 +33,8 @@ extern bool ghes_disable;
#ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void);
+int __init sdei_init(void);
+int __init ghes_init(void);
#else
static inline void acpi_hest_init(void) { return; }
#endif
--
2.20.1.9.gb50a0d7
