On Tue, 4 Aug 2020 12:40:50 -0700 Sean V Kelley <[email protected]> wrote:
> The Root Complex Event Collectors(RCEC) appear as peers to Root Ports > and also have the AER capability. So add RCEC support to the current AER > service driver and attach the AER service driver to the RCEC device. > > Co-developed-by: Qiuxu Zhuo <[email protected]> > Signed-off-by: Sean V Kelley <[email protected]> > Signed-off-by: Qiuxu Zhuo <[email protected]> Looks good to me. Reviewed-by: Jonathan Cameron <[email protected]> > --- > drivers/pci/pcie/aer.c | 27 ++++++++++++++++++++------- > 1 file changed, 20 insertions(+), 7 deletions(-) > > diff --git a/drivers/pci/pcie/aer.c b/drivers/pci/pcie/aer.c > index f658607e8e00..55ee9518368f 100644 > --- a/drivers/pci/pcie/aer.c > +++ b/drivers/pci/pcie/aer.c > @@ -300,7 +300,7 @@ int pci_aer_raw_clear_status(struct pci_dev *dev) > return -EIO; > > port_type = pci_pcie_type(dev); > - if (port_type == PCI_EXP_TYPE_ROOT_PORT) { > + if (port_type == PCI_EXP_TYPE_ROOT_PORT || port_type == > PCI_EXP_TYPE_RC_EC) { > pci_read_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, &status); > pci_write_config_dword(dev, aer + PCI_ERR_ROOT_STATUS, status); > } > @@ -595,7 +595,8 @@ static umode_t aer_stats_attrs_are_visible(struct kobject > *kobj, > if ((a == &dev_attr_aer_rootport_total_err_cor.attr || > a == &dev_attr_aer_rootport_total_err_fatal.attr || > a == &dev_attr_aer_rootport_total_err_nonfatal.attr) && > - pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) > + ((pci_pcie_type(pdev) != PCI_EXP_TYPE_ROOT_PORT) && > + (pci_pcie_type(pdev) != PCI_EXP_TYPE_RC_EC))) > return 0; > > return a->mode; > @@ -916,7 +917,10 @@ static bool find_source_device(struct pci_dev *parent, > if (result) > return true; > > - pci_walk_bus(parent->subordinate, find_device_iter, e_info); > + if (pci_pcie_type(parent) == PCI_EXP_TYPE_RC_EC) > + pcie_walk_rcec(parent, find_device_iter, e_info); > + else > + pci_walk_bus(parent->subordinate, find_device_iter, e_info); > > if (!e_info->error_dev_num) { > pci_info(parent, "can't find device of ID%04x\n", e_info->id); > @@ -1053,6 +1057,7 @@ int aer_get_device_error_info(struct pci_dev *dev, > struct aer_err_info *info) > if (!(info->status & ~info->mask)) > return 0; > } else if (pci_pcie_type(dev) == PCI_EXP_TYPE_ROOT_PORT || > + pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC || > pci_pcie_type(dev) == PCI_EXP_TYPE_DOWNSTREAM || > info->severity == AER_NONFATAL) { > > @@ -1205,6 +1210,7 @@ static int set_device_error_reporting(struct pci_dev > *dev, void *data) > int type = pci_pcie_type(dev); > > if ((type == PCI_EXP_TYPE_ROOT_PORT) || > + (type == PCI_EXP_TYPE_RC_EC) || > (type == PCI_EXP_TYPE_UPSTREAM) || > (type == PCI_EXP_TYPE_DOWNSTREAM)) { > if (enable) > @@ -1229,9 +1235,11 @@ static void > set_downstream_devices_error_reporting(struct pci_dev *dev, > { > set_device_error_reporting(dev, &enable); > > - if (!dev->subordinate) > - return; > - pci_walk_bus(dev->subordinate, set_device_error_reporting, &enable); > + if (pci_pcie_type(dev) == PCI_EXP_TYPE_RC_EC) > + pcie_walk_rcec(dev, set_device_error_reporting, &enable); > + else if (dev->subordinate) > + pci_walk_bus(dev->subordinate, set_device_error_reporting, > &enable); > + > } > > /** > @@ -1329,6 +1337,11 @@ static int aer_probe(struct pcie_device *dev) > struct device *device = &dev->device; > struct pci_dev *port = dev->port; > > + /* Limit to Root Ports or Root Complex Event Collectors */ > + if ((pci_pcie_type(port) != PCI_EXP_TYPE_RC_EC) && > + (pci_pcie_type(port) != PCI_EXP_TYPE_ROOT_PORT)) > + return -ENODEV; > + > rpc = devm_kzalloc(device, sizeof(struct aer_rpc), GFP_KERNEL); > if (!rpc) > return -ENOMEM; > @@ -1385,7 +1398,7 @@ static pci_ers_result_t aer_root_reset(struct pci_dev > *dev) > > static struct pcie_port_service_driver aerdriver = { > .name = "aer", > - .port_type = PCI_EXP_TYPE_ROOT_PORT, > + .port_type = PCIE_ANY_PORT, > .service = PCIE_PORT_SERVICE_AER, > > .probe = aer_probe,
