| Message ID | 1343836477-7287-14-git-send-email-jiang.liu@huawei.com (mailing list archive) |
|---|---|
| State | New, archived |
| Delegated to: | Bjorn Helgaas |
| Headers | show |
On 08/01/2012 08:54 AM, Jiang Liu wrote: > From: Jiang Liu<jiang.liu@huawei.com> > > Use PCIe capabilities access functions to simplify PCIe MIPS implementation. > > Signed-off-by: Jiang Liu<liuj97@gmail.com> Acked-by: David Daney <david.daney@cavium.com> > --- > arch/mips/pci/pci-octeon.c | 15 +++++---------- > 1 file changed, 5 insertions(+), 10 deletions(-) > > diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c > index 52a1ba7..aaed2ad 100644 > --- a/arch/mips/pci/pci-octeon.c > +++ b/arch/mips/pci/pci-octeon.c > @@ -117,16 +117,11 @@ int pcibios_plat_dev_init(struct pci_dev *dev) > } > > /* Enable the PCIe normal error reporting */ > - pos = pci_find_capability(dev, PCI_CAP_ID_EXP); > - if (pos) { > - /* Update Device Control */ > - pci_read_config_word(dev, pos + PCI_EXP_DEVCTL,&config); > - config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ > - config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ > - config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ > - config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ > - pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config); > - } > + config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ > + config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ > + config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ > + config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ > + pci_pcie_capability_change_word(dev, PCI_EXP_DEVCTL, config, 0); > > /* Find the Advanced Error Reporting capability */ > pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR); -- To unsubscribe from this list: send the line "unsubscribe linux-pci" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/arch/mips/pci/pci-octeon.c b/arch/mips/pci/pci-octeon.c index 52a1ba7..aaed2ad 100644 --- a/arch/mips/pci/pci-octeon.c +++ b/arch/mips/pci/pci-octeon.c @@ -117,16 +117,11 @@ int pcibios_plat_dev_init(struct pci_dev *dev) } /* Enable the PCIe normal error reporting */ - pos = pci_find_capability(dev, PCI_CAP_ID_EXP); - if (pos) { - /* Update Device Control */ - pci_read_config_word(dev, pos + PCI_EXP_DEVCTL, &config); - config |= PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ - config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ - config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ - config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ - pci_write_config_word(dev, pos + PCI_EXP_DEVCTL, config); - } + config = PCI_EXP_DEVCTL_CERE; /* Correctable Error Reporting */ + config |= PCI_EXP_DEVCTL_NFERE; /* Non-Fatal Error Reporting */ + config |= PCI_EXP_DEVCTL_FERE; /* Fatal Error Reporting */ + config |= PCI_EXP_DEVCTL_URRE; /* Unsupported Request */ + pci_pcie_capability_change_word(dev, PCI_EXP_DEVCTL, config, 0); /* Find the Advanced Error Reporting capability */ pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);