Skip to content

Commit 4ed7952

Browse files
benhartcheathamdavejiang
authored andcommitted
cxl/core: Fix cxl_dport debugfs EINJ entries
Protocol error injection is only valid for CXL 2.0+ root ports and CXL 1.1 memory-mapped downstream ports as per the ACPI v6.5 spec (Table 8-31). The core code currently creates an 'einj_inject' file in CXL debugfs for all CXL 1.1 downstream ports and all PCI CXL 2.0+ downstream ports. This results in debugfs EINJ files that won't work due to platform/spec restrictions. Fix by limiting 'einj_inject' file creation to only CXL 1.1 dports and CXL 2.0+ root ports. Update the comment above the check to more accurately represent the requirements expected by the EINJ module and ACPI spec. Fixes: 8039804 ("cxl/core: Add CXL EINJ debugfs files") Signed-off-by: Ben Cheatham <Benjamin.Cheatham@amd.com> Reviewed-by: Jonathan Cameron <jonathan.cameron@huawei.com> Reviewed-by: Alison Schofield <alison.schofield@intel.com> Reviewed-by: Dave Jiang <dave.jiang@intel.com> Link: https://patch.msgid.link/6e9fb657-8264-4028-92e2-5428e2695bf1@amd.com Signed-off-by: Dave Jiang <dave.jiang@intel.com>
1 parent 99698e7 commit 4ed7952

1 file changed

Lines changed: 5 additions & 3 deletions

File tree

drivers/cxl/core/port.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -822,16 +822,18 @@ DEFINE_DEBUGFS_ATTRIBUTE(cxl_einj_inject_fops, NULL, cxl_einj_inject,
822822

823823
static void cxl_debugfs_create_dport_dir(struct cxl_dport *dport)
824824
{
825+
struct cxl_port *parent = parent_port_of(dport->port);
825826
struct dentry *dir;
826827

827828
if (!einj_cxl_is_initialized())
828829
return;
829830

830831
/*
831-
* dport_dev needs to be a PCIe port for CXL 2.0+ ports because
832-
* EINJ expects a dport SBDF to be specified for 2.0 error injection.
832+
* Protocol error injection is only available for CXL 2.0+ root ports
833+
* and CXL 1.1 downstream ports
833834
*/
834-
if (!dport->rch && !dev_is_pci(dport->dport_dev))
835+
if (!dport->rch &&
836+
!(dev_is_pci(dport->dport_dev) && parent && is_cxl_root(parent)))
835837
return;
836838

837839
dir = cxl_debugfs_create_dir(dev_name(dport->dport_dev));

0 commit comments

Comments
 (0)