summaryrefslogtreecommitdiff
path: root/include/acpi
diff options
context:
space:
mode:
authorShuai Xue <xueshuai@linux.alibaba.com>2022-02-27 20:25:45 +0800
committerRafael J. Wysocki <rafael.j.wysocki@intel.com>2022-03-03 20:24:22 +0100
commitdc4e8c07e9e2f69387579c49caca26ba239f7270 (patch)
tree7f5ad8468e2363490d8a6b71251559c362fbf272 /include/acpi
parent7e57714cd0ad2d5bb90e50b5096a0e671dec1ef3 (diff)
downloadlwn-dc4e8c07e9e2f69387579c49caca26ba239f7270.tar.gz
lwn-dc4e8c07e9e2f69387579c49caca26ba239f7270.zip
ACPI: APEI: explicit init of HEST and GHES in apci_init()
From commit e147133a42cb ("ACPI / APEI: Make hest.c manage the estatus memory pool") was merged, ghes_init() relies on acpi_hest_init() to manage the estatus memory pool. On the other hand, ghes_init() relies on sdei_init() to detect the SDEI version and (un)register events. The dependencies are as follows: ghes_init() => acpi_hest_init() => acpi_bus_init() => acpi_init() ghes_init() => sdei_init() HEST is not PCI-specific and initcall ordering is implicit and not well-defined within a level. Based on above, remove acpi_hest_init() from acpi_pci_root_init() and convert ghes_init() and sdei_init() from initcalls to explicit calls in the following order: acpi_hest_init() ghes_init() sdei_init() Signed-off-by: Shuai Xue <xueshuai@linux.alibaba.com> Signed-off-by: Rafael J. Wysocki <rafael.j.wysocki@intel.com>
Diffstat (limited to 'include/acpi')
-rw-r--r--include/acpi/apei.h4
1 files changed, 3 insertions, 1 deletions
diff --git a/include/acpi/apei.h b/include/acpi/apei.h
index ece0a8af2bae..4e60dd73c3bb 100644
--- a/include/acpi/apei.h
+++ b/include/acpi/apei.h
@@ -27,14 +27,16 @@ extern int hest_disable;
extern int erst_disable;
#ifdef CONFIG_ACPI_APEI_GHES
extern bool ghes_disable;
+void __init ghes_init(void);
#else
#define ghes_disable 1
+static inline void ghes_init(void) { }
#endif
#ifdef CONFIG_ACPI_APEI
void __init acpi_hest_init(void);
#else
-static inline void acpi_hest_init(void) { return; }
+static inline void acpi_hest_init(void) { }
#endif
int erst_write(const struct cper_record_header *record);