Skip to content

Commit d1a9def

Browse files
ktbowman-amddjbw
authored andcommitted
cxl/pci: Disable root port interrupts in RCH mode
The RCH root port contains root command AER registers that should not be enabled.[1] Disable these to prevent root port interrupts. [1] CXL 3.0 - 12.2.1.1 RCH Downstream Port-detected Errors 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-17-rrichter@amd.com Signed-off-by: Dan Williams <dan.j.williams@intel.com>
1 parent 6ac0788 commit d1a9def

File tree

1 file changed

+32
-0
lines changed

1 file changed

+32
-0
lines changed

drivers/cxl/core/pci.c

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -763,6 +763,35 @@ static void cxl_dport_map_regs(struct cxl_dport *dport)
763763
cxl_dport_map_rch_aer(dport);
764764
}
765765

766+
static void cxl_disable_rch_root_ints(struct cxl_dport *dport)
767+
{
768+
void __iomem *aer_base = dport->regs.dport_aer;
769+
struct pci_host_bridge *bridge;
770+
u32 aer_cmd_mask, aer_cmd;
771+
772+
if (!aer_base)
773+
return;
774+
775+
bridge = to_pci_host_bridge(dport->dport_dev);
776+
777+
/*
778+
* Disable RCH root port command interrupts.
779+
* CXL 3.0 12.2.1.1 - RCH Downstream Port-detected Errors
780+
*
781+
* This sequence may not be necessary. CXL spec states disabling
782+
* the root cmd register's interrupts is required. But, PCI spec
783+
* shows these are disabled by default on reset.
784+
*/
785+
if (bridge->native_cxl_error) {
786+
aer_cmd_mask = (PCI_ERR_ROOT_CMD_COR_EN |
787+
PCI_ERR_ROOT_CMD_NONFATAL_EN |
788+
PCI_ERR_ROOT_CMD_FATAL_EN);
789+
aer_cmd = readl(aer_base + PCI_ERR_ROOT_COMMAND);
790+
aer_cmd &= ~aer_cmd_mask;
791+
writel(aer_cmd, aer_base + PCI_ERR_ROOT_COMMAND);
792+
}
793+
}
794+
766795
void cxl_setup_parent_dport(struct device *host, struct cxl_dport *dport)
767796
{
768797
struct device *dport_dev = dport->dport_dev;
@@ -774,6 +803,9 @@ void cxl_setup_parent_dport(struct device *host, struct cxl_dport *dport)
774803

775804
dport->reg_map.host = host;
776805
cxl_dport_map_regs(dport);
806+
807+
if (dport->rch)
808+
cxl_disable_rch_root_ints(dport);
777809
}
778810
EXPORT_SYMBOL_NS_GPL(cxl_setup_parent_dport, CXL);
779811

0 commit comments

Comments
 (0)