summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorLinus Torvalds <torvalds@linux-foundation.org>2026-11-20 12:39:08 -0800
committerLinus Torvalds <torvalds@linux-foundation.org>2026-11-20 12:39:08 -0800
commitb98adc197f7300e875fbcd4cf5dfa5ebe3d6dc08 (patch)
treeb34acf7e17cc3e5cc952632f4067c01ca9053737
parentddefe07f600b89762853a50a61bb4ee0e3f864ed (diff)
parenta02576de05178f15ffe6fc7551496de7de8acfde (diff)
Merge tag 'cxl-fixes-7.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl
Pull cxl fixes from Dave Jiang: "A small collection of CXL fixes" * tag 'cxl-fixes-7.4-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl: cxl/port: Fix endpoint RAS error unmasking cxl/test: Free the decoder registry when cxl_test_init() fails cxl/region: Reject a repeat write of an endpoint decoder to targetN cxl/region: Restore a target's position from its slot after sorting
-rw-r--r--drivers/cxl/core/region.c11
-rw-r--r--drivers/cxl/port.c16
-rw-r--r--tools/testing/cxl/test/cxl.c24
3 files changed, 30 insertions, 21 deletions
diff --git a/drivers/cxl/core/region.c b/drivers/cxl/core/region.c
index a048bd5c06cb..f8c88113de35 100644
--- a/drivers/cxl/core/region.c
+++ b/drivers/cxl/core/region.c
@@ -1764,9 +1764,6 @@ static int cxl_region_validate_position(struct cxl_region *cxlr,
return -ENXIO;
}
- if (p->targets[pos] == cxled)
- return 0;
-
if (p->targets[pos]) {
struct cxl_endpoint_decoder *cxled_target = p->targets[pos];
struct cxl_memdev *cxlmd_target = cxled_to_memdev(cxled_target);
@@ -2045,6 +2042,14 @@ static int cxl_region_sort_targets(struct cxl_region *cxlr)
sort(p->targets, p->nr_targets, sizeof(p->targets[0]),
cmp_interleave_pos, NULL);
+ /*
+ * Restore cxled->pos from its ->targets[] slot so that follow-on
+ * code paths can reliably do p->targets[cxled->pos] to
+ * self-reference their entry, whether or not the sort succeeded.
+ */
+ for (i = 0; i < p->nr_targets; i++)
+ p->targets[i]->pos = i;
+
dev_dbg(&cxlr->dev, "region sort %s\n", rc ? "failed" : "successful");
return rc;
}
diff --git a/drivers/cxl/port.c b/drivers/cxl/port.c
index c12fd0b89883..7b4726c7276d 100644
--- a/drivers/cxl/port.c
+++ b/drivers/cxl/port.c
@@ -72,19 +72,21 @@ static int cxl_switch_port_probe(struct cxl_port *port)
return 0;
}
-static int cxl_ras_unmask(struct cxl_port *port)
+static int cxl_endpoint_ras_unmask(struct cxl_port *endpoint)
{
+ struct cxl_memdev *cxlmd = to_cxl_memdev(endpoint->uport_dev);
+ struct device *parent = cxlmd->dev.parent;
struct pci_dev *pdev;
void __iomem *addr;
u32 orig_val, val, mask;
u16 cap;
int rc;
- if (!dev_is_pci(port->uport_dev))
+ if (!dev_is_pci(parent))
return 0;
- pdev = to_pci_dev(port->uport_dev);
+ pdev = to_pci_dev(parent);
- if (!port->regs.ras) {
+ if (!endpoint->regs.ras) {
pci_dbg(pdev, "No RAS registers.\n");
return 0;
}
@@ -98,7 +100,7 @@ static int cxl_ras_unmask(struct cxl_port *port)
return rc;
if (cap & PCI_EXP_DEVCTL_URRE) {
- addr = port->regs.ras + CXL_RAS_UNCORRECTABLE_MASK_OFFSET;
+ addr = endpoint->regs.ras + CXL_RAS_UNCORRECTABLE_MASK_OFFSET;
orig_val = readl(addr);
mask = CXL_RAS_UNCORRECTABLE_MASK_MASK |
@@ -110,7 +112,7 @@ static int cxl_ras_unmask(struct cxl_port *port)
}
if (cap & PCI_EXP_DEVCTL_CERE) {
- addr = port->regs.ras + CXL_RAS_CORRECTABLE_MASK_OFFSET;
+ addr = endpoint->regs.ras + CXL_RAS_CORRECTABLE_MASK_OFFSET;
orig_val = readl(addr);
val = orig_val & ~CXL_RAS_CORRECTABLE_MASK_MASK;
writel(val, addr);
@@ -152,7 +154,7 @@ static int cxl_endpoint_port_probe(struct cxl_port *port)
devm_cxl_dport_rch_ras_setup(dport);
devm_cxl_port_ras_setup(port);
- if (cxl_ras_unmask(port))
+ if (cxl_endpoint_ras_unmask(port))
dev_dbg(&port->dev, "failed to unmask RAS interrupts\n");
/*
diff --git a/tools/testing/cxl/test/cxl.c b/tools/testing/cxl/test/cxl.c
index 3eb1051b1ee8..e3bed17ae253 100644
--- a/tools/testing/cxl/test/cxl.c
+++ b/tools/testing/cxl/test/cxl.c
@@ -2436,6 +2436,17 @@ static int cxl_topo_init(void)
return cxl_type3_topo_init();
}
+static void free_decoder_registry(void)
+{
+ unsigned long index;
+ void *entry;
+
+ xa_for_each(&decoder_registry, index, entry) {
+ xa_erase(&decoder_registry, index);
+ kfree(entry);
+ }
+}
+
static __init int cxl_test_init(void)
{
struct range mappable;
@@ -2525,20 +2536,11 @@ err_gen_pool_add:
gen_pool_destroy(cxl_mock_pool);
err_gen_pool_create:
unregister_cxl_mock_ops(&cxl_mock_ops);
+ free_decoder_registry();
+ xa_destroy(&decoder_registry);
return rc;
}
-static void free_decoder_registry(void)
-{
- unsigned long index;
- void *entry;
-
- xa_for_each(&decoder_registry, index, entry) {
- xa_erase(&decoder_registry, index);
- kfree(entry);
- }
-}
-
static __exit void cxl_test_exit(void)
{
hmem_test_exit();