From: Ben Cheatham <Benjamin.Cheatham@amd.com>
To: <dan.j.williams@intel.com>, <dave@stogolabs.net>,
<jonathan.cameron@huawei.com>, <dave.jiang@intel.com>,
<alison.schofield@intel.com>, <vishal.l.verma@intel.com>,
<ira.weiny@intel.com>, <rafael@kernel.org>
Cc: <linux-cxl@vger.kernel.org>, <linux-acpi@vger.kernel.org>,
<benjamin.cheatham@amd.com>
Subject: [PATCH v9 3/5] EINJ: Migrate to a platform driver
Date: Mon, 15 Jan 2024 11:20:05 -0600 [thread overview]
Message-ID: <20240115172007.309547-4-Benjamin.Cheatham@amd.com> (raw)
In-Reply-To: <20240115172007.309547-1-Benjamin.Cheatham@amd.com>
Change the EINJ module to install a platform device/driver on module
init and move the module init() and exit() functions to driver probe and
remove. This change allows the EINJ module to load regardless of whether
setting up EINJ succeeds, which allows dependent modules to still load
(i.e. the CXL core).
Since EINJ may no longer be initialized when the module loads, any
functions that are called from dependent/external modules should check
the einj_initialized variable before calling any EINJ functions.
Signed-off-by: Ben Cheatham <Benjamin.Cheatham@amd.com>
---
drivers/acpi/apei/einj.c | 43 ++++++++++++++++++++++++++++++++++++++--
1 file changed, 41 insertions(+), 2 deletions(-)
diff --git a/drivers/acpi/apei/einj.c b/drivers/acpi/apei/einj.c
index 013eb621dc92..10d51cd73fa4 100644
--- a/drivers/acpi/apei/einj.c
+++ b/drivers/acpi/apei/einj.c
@@ -21,6 +21,7 @@
#include <linux/nmi.h>
#include <linux/delay.h>
#include <linux/mm.h>
+#include <linux/platform_device.h>
#include <asm/unaligned.h>
#include "apei-internal.h"
@@ -136,6 +137,12 @@ static struct apei_exec_ins_type einj_ins_type[] = {
*/
static DEFINE_MUTEX(einj_mutex);
+/*
+ * Functions called from dependent modules should check this variable
+ * before using any EINJ functionality.
+ */
+static bool einj_initialized;
+
static void *einj_param;
static void einj_exec_ctx_init(struct apei_exec_context *ctx)
@@ -684,7 +691,7 @@ static int einj_check_table(struct acpi_table_einj *einj_tab)
return 0;
}
-static int __init einj_init(void)
+static int einj_probe(struct platform_device *pdev)
{
int rc;
acpi_status status;
@@ -782,7 +789,7 @@ static int __init einj_init(void)
return rc;
}
-static void __exit einj_exit(void)
+static void einj_remove(struct platform_device *pdev)
{
struct apei_exec_context ctx;
@@ -801,6 +808,38 @@ static void __exit einj_exit(void)
acpi_put_table((struct acpi_table_header *)einj_tab);
}
+static struct platform_device *einj_dev;
+struct platform_driver einj_driver = {
+ .remove_new = einj_remove,
+ .driver = {
+ .name = "einj",
+ },
+};
+
+static int __init einj_init(void)
+{
+ struct platform_device_info einj_dev_info = {
+ .name = "einj",
+ .id = -1,
+ };
+
+ einj_dev = platform_device_register_full(&einj_dev_info);
+ einj_initialized = !platform_driver_probe(&einj_driver, einj_probe);
+
+ if (!(einj_initialized || IS_ERR_OR_NULL(einj_dev)))
+ platform_device_del(einj_dev);
+
+ return 0;
+}
+
+static void __exit einj_exit(void)
+{
+ if (einj_initialized) {
+ platform_driver_unregister(&einj_driver);
+ platform_device_del(einj_dev);
+ }
+}
+
module_init(einj_init);
module_exit(einj_exit);
--
2.34.1
next prev parent reply other threads:[~2024-01-15 17:21 UTC|newest]
Thread overview: 14+ messages / expand[flat|nested] mbox.gz Atom feed top
2024-01-15 17:20 [PATCH v9 0/5] CXL, ACPI, APEI, EINJ: Update EINJ for CXL error types Ben Cheatham
2024-01-15 17:20 ` [PATCH v9 1/5] cxl, ACPI, APEI, EINJ: Add CXL_EINJ Kconfig option Ben Cheatham
2024-01-15 17:20 ` [PATCH v9 2/5] ACPI: Add CXL protocol error defines Ben Cheatham
2024-01-15 17:20 ` Ben Cheatham [this message]
2024-01-16 23:47 ` [PATCH v9 3/5] EINJ: Migrate to a platform driver Dan Williams
2024-01-17 16:14 ` Ben Cheatham
2024-01-15 17:20 ` [PATCH v9 4/5] cxl/core, EINJ: Add EINJ CXL debugfs files and EINJ helper functions Ben Cheatham
2024-01-16 23:58 ` Dan Williams
2024-01-17 16:14 ` Ben Cheatham
2024-01-17 0:06 ` Dan Williams
2024-01-17 16:15 ` Ben Cheatham
2024-01-15 17:20 ` [PATCH v9 5/5] EINJ, Documentation: Update EINJ kernel doc Ben Cheatham
2024-01-16 23:57 ` Dan Williams
2024-01-17 16:15 ` Ben Cheatham
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=20240115172007.309547-4-Benjamin.Cheatham@amd.com \
--to=benjamin.cheatham@amd.com \
--cc=alison.schofield@intel.com \
--cc=dan.j.williams@intel.com \
--cc=dave.jiang@intel.com \
--cc=dave@stogolabs.net \
--cc=ira.weiny@intel.com \
--cc=jonathan.cameron@huawei.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=rafael@kernel.org \
--cc=vishal.l.verma@intel.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: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox