Skip to content

Commit 0cab687

Browse files
Robert Richterdjbw
authored andcommitted
cxl/pci: Fix disabling memory if DVSEC CXL Range does not match a CFMWS window
The Linux CXL subsystem is built on the assumption that HPA == SPA. That is, the host physical address (HPA) the HDM decoder registers are programmed with are system physical addresses (SPA). During HDM decoder setup, the DVSEC CXL range registers (cxl-3.1, 8.1.3.8) are checked if the memory is enabled and the CXL range is in a HPA window that is described in a CFMWS structure of the CXL host bridge (cxl-3.1, 9.18.1.3). Now, if the HPA is not an SPA, the CXL range does not match a CFMWS window and the CXL memory range will be disabled then. The HDM decoder stops working which causes system memory being disabled and further a system hang during HDM decoder initialization, typically when a CXL enabled kernel boots. Prevent a system hang and do not disable the HDM decoder if the decoder's CXL range is not found in a CFMWS window. Note the change only fixes a hardware hang, but does not implement HPA/SPA translation. Support for this can be added in a follow on patch series. Signed-off-by: Robert Richter <[email protected]> Fixes: 34e37b4 ("cxl/port: Enable HDM Capability after validating DVSEC Ranges") Cc: <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Dan Williams <[email protected]>
1 parent 117132e commit 0cab687

File tree

1 file changed

+3
-3
lines changed

1 file changed

+3
-3
lines changed

drivers/cxl/core/pci.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -477,9 +477,9 @@ int cxl_hdm_decode_init(struct cxl_dev_state *cxlds, struct cxl_hdm *cxlhdm,
477477
allowed++;
478478
}
479479

480-
if (!allowed) {
481-
cxl_set_mem_enable(cxlds, 0);
482-
info->mem_enabled = 0;
480+
if (!allowed && info->mem_enabled) {
481+
dev_err(dev, "Range register decodes outside platform defined CXL ranges.\n");
482+
return -ENXIO;
483483
}
484484

485485
/*

0 commit comments

Comments
 (0)