From: Ben Cheatham <Benjamin.Cheatham@amd.com>
To: <linux-cxl@vger.kernel.org>, <linux-pci@vger.kernel.org>,
<linux-acpi@vger.kernel.org>
Cc: Ben Cheatham <Benjamin.Cheatham@amd.com>
Subject: [PATCH 16/16] cxl/core, cxl/acpi: Add CXL isolation notify handler
Date: Wed, 30 Jul 2025 16:47:18 -0500 [thread overview]
Message-ID: <20250730214718.10679-17-Benjamin.Cheatham@amd.com> (raw)
In-Reply-To: <20250730214718.10679-1-Benjamin.Cheatham@amd.com>
Install ACPI 0x80 notify handler for CXL isolation, based on the result
of the _OSC negotiation. The handler is once installed per CXL host bridge
(HID of "ACPI0016") as part of isolation set up.
A link for the ECN (expected in CXL 4.0 spec) that introduces the
relevant parts of the _OSC method (CXL 3.2 9.18.2) can be found below.
spec). This link is only accesible to CXL SSWG members, so here's a brief
overview:
The ECN introduces a field in the _OSC method to control how the OSPM is
notified isolation has occurred. If the ERR_COR Signaling Supported bit
in the isolation capability register (CXL 3.2 8.2.4.24.1) is NOT set,
this portion of the _OSC can be ignored.
If the OSPM is given control of isolation notification, the mechanism to
be used when isolation occurs is an MSI/-X interrupt (pre-ECN behavior).
If the platorm firmware reserves control, the OSPM will be notified
through a ACPI 0x80 notify on the CXL host bridge ACPI device (ACPI HID:
"ACPI0016").
Link: https://members.computeexpresslink.org/wg/software_systems/document/3118
Signed-off-by: Ben Cheatham <Benjamin.Cheatham@amd.com>
---
drivers/cxl/acpi.c | 51 +++++++++++++++++++++++++++++++++++++++++
drivers/cxl/core/port.c | 41 +++++++++++++++++++++++++--------
drivers/cxl/cxl.h | 3 +++
3 files changed, 86 insertions(+), 9 deletions(-)
diff --git a/drivers/cxl/acpi.c b/drivers/cxl/acpi.c
index b964f02fb56b..145a03f15255 100644
--- a/drivers/cxl/acpi.c
+++ b/drivers/cxl/acpi.c
@@ -390,10 +390,61 @@ static void decode_isolation_osc(struct cxl_port *hb, u32 iso_cap)
hb->isolation_caps |= CXL_ISOLATION_INTERRUPTS;
}
+static void isolation_notify_handler(acpi_handle handle, u32 event, void *data)
+{
+ struct cxl_port *hb = data;
+ struct cxl_dport *dport;
+ unsigned long index;
+
+ guard(device)(&hb->dev);
+ xa_for_each(&hb->dports, index, dport) {
+ if (dport->regs.isolation)
+ cxl_isolation_interrupt_handler(dport);
+ }
+}
+
+static void cxl_remove_iso_handler(void *data)
+{
+ acpi_handle handle = data;
+
+ acpi_remove_notify_handler(handle, ACPI_DEVICE_NOTIFY,
+ isolation_notify_handler);
+}
+
+static int cxl_register_iso_handler(struct cxl_port *hb)
+{
+ struct acpi_device *adev = ACPI_COMPANION(hb->uport_dev);
+ acpi_handle handle;
+ int rc;
+
+ if (!adev)
+ return -EINVAL;
+
+ handle = acpi_device_handle(adev);
+
+ guard(device)(&hb->dev);
+ if (devm_is_action_added(&hb->dev, cxl_remove_iso_handler, handle))
+ return 0;
+
+ rc = acpi_install_notify_handler(handle, ACPI_DEVICE_NOTIFY,
+ isolation_notify_handler, hb);
+ if (rc != AE_OK)
+ return -ENXIO;
+
+ rc = devm_add_action_or_reset(&hb->dev, cxl_remove_iso_handler,
+ handle);
+ if (rc)
+ return rc;
+
+ dev_dbg(&hb->dev, "Installed CXL isolation notify handler\n");
+ return 0;
+}
+
static const struct cxl_root_ops acpi_root_ops = {
.qos_class = cxl_acpi_qos_class,
.setup_hostbridge_uport = cxl_acpi_setup_hostbridge_uport,
.get_isolation_caps = decode_isolation_osc,
+ .register_hb_isolation_handler = cxl_register_iso_handler,
};
static void del_cxl_resource(struct resource *res)
diff --git a/drivers/cxl/core/port.c b/drivers/cxl/core/port.c
index e9eb7a8a5f72..ece667f3aaf5 100644
--- a/drivers/cxl/core/port.c
+++ b/drivers/cxl/core/port.c
@@ -1207,11 +1207,9 @@ struct isolation_intr_data {
struct cxl_port *port;
};
-static irqreturn_t cxl_isolation_thread(int irq, void *_data)
+int cxl_isolation_interrupt_handler(struct cxl_dport *dport)
{
- struct isolation_intr_data *data = _data;
- struct cxl_dport *dport = data->dport;
- struct cxl_port *port = data->port;
+ struct cxl_port *port = dport->port;
enum cxl_err_results res, acc;
struct cxl_dev_state *cxlds;
struct cxl_memdev *cxlmd;
@@ -1221,10 +1219,6 @@ static irqreturn_t cxl_isolation_thread(int irq, void *_data)
bool lnk_down;
u32 status;
- if (!dport || !port)
- return IRQ_NONE;
-
- guard(device)(&port->dev);
if (!dport->regs.isolation)
goto panic;
@@ -1255,8 +1249,9 @@ static irqreturn_t cxl_isolation_thread(int irq, void *_data)
panic:
panic("%s: downstream devices could not recover from CXL.mem link down\n",
dev_name(dport->dport_dev));
- return IRQ_NONE;
+ return -ENXIO;
}
+EXPORT_SYMBOL_NS_GPL(cxl_isolation_interrupt_handler, "CXL");
static void cxl_dport_free_interrupts(void *data)
{
@@ -1274,6 +1269,24 @@ static void cxl_dport_free_interrupts(void *data)
devm_free_irq(info->dev, info->irq, dport);
}
+static irqreturn_t cxl_isolation_thread(int irq, void *_data)
+{
+ struct isolation_intr_data *data = _data;
+ struct cxl_dport *dport = data->dport;
+ struct cxl_port *port = data->port;
+ int rc;
+
+ if (!dport || !port)
+ return IRQ_NONE;
+
+ guard(device)(&port->dev);
+ rc = cxl_isolation_interrupt_handler(dport);
+ if (rc)
+ return IRQ_NONE;
+
+ return IRQ_HANDLED;
+}
+
static int cxl_dport_setup_interrupts(struct device *host,
struct cxl_dport *dport)
{
@@ -1282,6 +1295,16 @@ static int cxl_dport_setup_interrupts(struct device *host,
u32 cap;
int rc;
+ if (!(dport->port->isolation_caps & CXL_ISOLATION_INTERRUPTS)) {
+ struct cxl_root *root __free(put_cxl_root) =
+ find_cxl_root(dport->port);
+ if (!root || !root->ops ||
+ !root->ops->register_hb_isolation_handler)
+ return -ENXIO;
+
+ return root->ops->register_hb_isolation_handler(dport->port);
+ }
+
cap = readl(dport->regs.isolation + CXL_ISOLATION_CAPABILITY_OFFSET);
if (!(cap & CXL_ISOLATION_CAP_INTR_SUPP))
return -ENXIO;
diff --git a/drivers/cxl/cxl.h b/drivers/cxl/cxl.h
index aa36eba79181..68074c0d78d1 100644
--- a/drivers/cxl/cxl.h
+++ b/drivers/cxl/cxl.h
@@ -684,8 +684,11 @@ struct cxl_root_ops {
struct device *bridge_dev);
void (*get_isolation_caps)(struct cxl_port *hb,
u32 iso_cap);
+ int (*register_hb_isolation_handler)(struct cxl_port *hb);
};
+int cxl_isolation_interrupt_handler(struct cxl_dport *dport);
+
static inline struct cxl_dport *
cxl_find_dport_by_dev(struct cxl_port *port, const struct device *dport_dev)
{
--
2.34.1
prev parent reply other threads:[~2025-07-30 21:51 UTC|newest]
Thread overview: 37+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-07-30 21:47 [PATCH 00/16] CXL.mem error isolation support Ben Cheatham
2025-07-30 21:47 ` [PATCH 01/16] cxl/regs: Add cxl_unmap_component_regs() Ben Cheatham
2025-09-12 14:46 ` Jonathan Cameron
2025-09-17 17:26 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 02/16] cxl/regs: Add CXL Isolation capability mapping Ben Cheatham
2025-09-12 14:47 ` Jonathan Cameron
2025-07-30 21:47 ` [PATCH 03/16] PCI: PCIe portdrv: Add CXL Isolation service driver Ben Cheatham
2025-09-12 15:14 ` Jonathan Cameron
2025-09-17 17:26 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 04/16] PCI: PCIe portdrv: Allocate CXL isolation MSI/-X vector Ben Cheatham
2025-08-04 21:39 ` Bjorn Helgaas
2025-08-06 17:58 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 05/16] PCI: PCIe portdrv: Add interface for getting CXL isolation IRQ Ben Cheatham
2025-07-31 5:59 ` Lukas Wunner
2025-07-31 13:13 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 06/16] cxl/core: Enable CXL.mem isolation Ben Cheatham
2025-09-12 15:21 ` Jonathan Cameron
2025-09-17 17:26 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 07/16] cxl/core: Set up isolation interrupts Ben Cheatham
2025-09-12 15:25 ` Jonathan Cameron
2025-09-17 17:27 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 08/16] cxl/core: Enable CXL " Ben Cheatham
2025-07-30 21:47 ` [PATCH 09/16] cxl/core: Prevent onlining CXL memory behind isolated ports Ben Cheatham
2025-07-30 21:47 ` [PATCH 10/16] cxl/core: Enable CXL.mem timeout Ben Cheatham
2025-07-30 21:47 ` [PATCH 11/16] cxl/pci: Add isolation handler Ben Cheatham
2025-07-30 21:47 ` [PATCH 12/16] PCI: PCIe portdrv: Add cxl_isolation sysfs attributes Ben Cheatham
2025-09-12 15:33 ` Jonathan Cameron
2025-09-17 17:27 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 13/16] cxl/core, PCI: PCIe portdrv: Add CXL timeout range programming Ben Cheatham
2025-08-04 21:39 ` Bjorn Helgaas
2025-08-06 17:58 ` Cheatham, Benjamin
2025-09-12 15:55 ` Jonathan Cameron
2025-09-17 17:27 ` Cheatham, Benjamin
2025-07-30 21:47 ` [PATCH 14/16] ACPI: Add CXL isolation _OSC fields Ben Cheatham
2025-08-22 19:19 ` Rafael J. Wysocki
2025-07-30 21:47 ` [PATCH 15/16] cxl/core, cxl/acpi: Enable CXL isolation based on _OSC handshake Ben Cheatham
2025-07-30 21:47 ` Ben Cheatham [this message]
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=20250730214718.10679-17-Benjamin.Cheatham@amd.com \
--to=benjamin.cheatham@amd.com \
--cc=linux-acpi@vger.kernel.org \
--cc=linux-cxl@vger.kernel.org \
--cc=linux-pci@vger.kernel.org \
/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;
as well as URLs for NNTP newsgroup(s).