Skip to content

Commit f05fd10

Browse files
Robert Richterdjbw
authored andcommitted
cxl/pci: Add RCH downstream port AER register discovery
Restricted CXL host (RCH) downstream port AER information is not currently logged while in the error state. One problem preventing the error logging is the AER and RAS registers are not accessible. The CXL driver requires changes to find RCH downstream port AER and RAS registers for purpose of error logging. RCH downstream ports are not enumerated during a PCI bus scan and are instead discovered using system firmware, ACPI in this case.[1] The downstream port is implemented as a Root Complex Register Block (RCRB). The RCRB is a 4k memory block containing PCIe registers based on the PCIe root port.[2] The RCRB includes AER extended capability registers used for reporting errors. Note, the RCH's AER Capability is located in the RCRB memory space instead of PCI configuration space, thus its register access is different. Existing kernel PCIe AER functions can not be used to manage the downstream port AER capabilities and RAS registers because the port was not enumerated during PCI scan and the registers are not PCI config accessible. Discover RCH downstream port AER extended capability registers. Use MMIO accesses to search for extended AER capability in RCRB register space. [1] CXL 3.0 Spec, 9.11.2 - System Firmware View of CXL 1.1 Hierarchy [2] CXL 3.0 Spec, 8.2.1.1 - RCH Downstream Port RCRB Co-developed-by: Robert Richter <rrichter@amd.com> Signed-off-by: Terry Bowman <terry.bowman@amd.com> Signed-off-by: Robert Richter <rrichter@amd.com> Reviewed-by: Jonathan Cameron <Jonathan.Cameron@huawei.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Link: https://lore.kernel.org/r/20231018171713.1883517-12-rrichter@amd.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent a2fcb84 commit f05fd10

File tree

5 files changed

+61
-0
lines changed

5 files changed

+61
-0
lines changed

drivers/cxl/core/core.h

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -73,6 +73,7 @@ struct cxl_rcrb_info;
7373
resource_size_t __rcrb_to_component(struct device *dev,
7474
struct cxl_rcrb_info *ri,
7575
enum cxl_rcrb which);
76+
u16 cxl_rcrb_to_aer(struct device *dev, resource_size_t rcrb);
7677

7778
extern struct rw_semaphore cxl_dpa_rwsem;
7879

drivers/cxl/core/pci.c

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -718,6 +718,21 @@ static bool cxl_report_and_clear(struct cxl_dev_state *cxlds)
718718
return true;
719719
}
720720

721+
#ifdef CONFIG_PCIEAER_CXL
722+
723+
void cxl_setup_parent_dport(struct device *host, struct cxl_dport *dport)
724+
{
725+
struct device *dport_dev = dport->dport_dev;
726+
struct pci_host_bridge *host_bridge;
727+
728+
host_bridge = to_pci_host_bridge(dport_dev);
729+
if (host_bridge->native_cxl_error)
730+
dport->rcrb.aer_cap = cxl_rcrb_to_aer(dport_dev, dport->rcrb.base);
731+
}
732+
EXPORT_SYMBOL_NS_GPL(cxl_setup_parent_dport, CXL);
733+
734+
#endif
735+
721736
pci_ers_result_t cxl_error_detected(struct pci_dev *pdev,
722737
pci_channel_state_t state)
723738
{

drivers/cxl/core/regs.c

Lines changed: 36 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -470,6 +470,42 @@ int cxl_setup_regs(struct cxl_register_map *map)
470470
}
471471
EXPORT_SYMBOL_NS_GPL(cxl_setup_regs, CXL);
472472

473+
u16 cxl_rcrb_to_aer(struct device *dev, resource_size_t rcrb)
474+
{
475+
void __iomem *addr;
476+
u16 offset = 0;
477+
u32 cap_hdr;
478+
479+
if (WARN_ON_ONCE(rcrb == CXL_RESOURCE_NONE))
480+
return 0;
481+
482+
if (!request_mem_region(rcrb, SZ_4K, dev_name(dev)))
483+
return 0;
484+
485+
addr = ioremap(rcrb, SZ_4K);
486+
if (!addr)
487+
goto out;
488+
489+
cap_hdr = readl(addr + offset);
490+
while (PCI_EXT_CAP_ID(cap_hdr) != PCI_EXT_CAP_ID_ERR) {
491+
offset = PCI_EXT_CAP_NEXT(cap_hdr);
492+
493+
/* Offset 0 terminates capability list. */
494+
if (!offset)
495+
break;
496+
cap_hdr = readl(addr + offset);
497+
}
498+
499+
if (offset)
500+
dev_dbg(dev, "found AER extended capability (0x%x)\n", offset);
501+
502+
iounmap(addr);
503+
out:
504+
release_mem_region(rcrb, SZ_4K);
505+
506+
return offset;
507+
}
508+
473509
resource_size_t __rcrb_to_component(struct device *dev, struct cxl_rcrb_info *ri,
474510
enum cxl_rcrb which)
475511
{

drivers/cxl/cxl.h

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -704,6 +704,13 @@ struct cxl_dport *devm_cxl_add_rch_dport(struct cxl_port *port,
704704
struct device *dport_dev, int port_id,
705705
resource_size_t rcrb);
706706

707+
#ifdef CONFIG_PCIEAER_CXL
708+
void cxl_setup_parent_dport(struct device *host, struct cxl_dport *dport);
709+
#else
710+
static inline void cxl_setup_parent_dport(struct device *host,
711+
struct cxl_dport *dport) { }
712+
#endif
713+
707714
struct cxl_decoder *to_cxl_decoder(struct device *dev);
708715
struct cxl_root_decoder *to_cxl_root_decoder(struct device *dev);
709716
struct cxl_switch_decoder *to_cxl_switch_decoder(struct device *dev);

drivers/cxl/mem.c

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -157,6 +157,8 @@ static int cxl_mem_probe(struct device *dev)
157157
else
158158
endpoint_parent = &parent_port->dev;
159159

160+
cxl_setup_parent_dport(dev, dport);
161+
160162
device_lock(endpoint_parent);
161163
if (!endpoint_parent->driver) {
162164
dev_err(dev, "CXL port topology %s not enabled\n",

0 commit comments

Comments
 (0)