The CXL core module should be able to load regardless of whether the
EINJ module initializes correctly. Instead of porting the EINJ module to
a library module, add a wrapper __init function around einj_init() to
pin the EINJ module even if it does not initialize correctly. This
should be fine since the EINJ module is only ever unloaded manually.
One note: since the CXL core will be calling into the EINJ module
directly, even though it may not have initialized, all CXL helper
functions *have* to check if the EINJ module is initialized before
doing any work.
Reviewed-by: Jonathan Cameron <Jonathan.Cameron@xxxxxxxxxx>
Signed-off-by: Ben Cheatham <Benjamin.Cheatham@xxxxxxx>
---
drivers/acpi/apei/einj.c | 25 ++++++++++++++++++++++++-
1 file changed, 24 insertions(+), 1 deletion(-)
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 013eb621dc92..26a887d2a5cd 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -615,6 +615,8 @@ static int available_error_type_show(struct seq_file *m, void *v)
DEFINE_SHOW_ATTRIBUTE(available_error_type);
+static bool einj_initialized;
+
static int error_type_get(void *data, u64 *val)
{
*val = error_type;
@@ -684,7 +686,7 @@ static int einj_check_table(struct acpi_table_einj *einj_tab)
return 0;
}
-static int __init einj_init(void)
+static int __init __einj_init(void)
{
int rc;
acpi_status status;
@@ -782,10 +784,31 @@ static int __init einj_init(void)
return rc;
}
+static int __init einj_init(void)
+{
+ int rc = __einj_init();
+
+ einj_initialized = (rc == 0);
+
+ /*
+ * CXL needs to be able to link and call its EINJ helpers
+ * regardless of whether the EINJ table is present and initialized
+ * correctly. CXL helpers check @einj_initialized before
+ * doing any work.
+ */
+ if (IS_ENABLED(CONFIG_CXL_EINJ))
+ return 0;
+
+ return rc;
+}
+
static void __exit einj_exit(void)
{
struct apei_exec_context ctx;
+ if (!einj_initialized)
+ return;
+
if (einj_param) {
acpi_size size = (acpi5) ?
sizeof(struct set_error_type_with_address) :
--
2.34.1
