diff options
| author | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:42:57 -0500 |
|---|---|---|
| committer | Bjorn Helgaas <bhelgaas@google.com> | 2016-10-03 09:42:57 -0500 |
| commit | 4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf (patch) | |
| tree | 99563a111f0f5c0b2d8e90acfe840c7db1d0c603 /drivers/pci/probe.c | |
| parent | 9e18ad98ca71ca0cfcadf633547409829773f36a (diff) | |
| parent | 6b20f728549030056402d7f68ea670eea1eb8198 (diff) | |
| download | linux-4dc2db096a9f7c0316bafc18ee00d89e0acf4ebf.tar.bz2 | |
Merge branch 'pci/aer' into next
* pci/aer:
PCI/AER: Fix aer_probe() kernel-doc comment
PCI/AER: Cache capability position
PCI/AER: Avoid memory allocation in interrupt handling path
ACPI / APEI: Send correct severity to calculate AER severity
PCI/AER: Remove duplicate AER severity translation
PCI/AER: Remove aerdriver.forceload kernel parameter
PCI/AER: Remove aerdriver.nosourceid kernel parameter
x86/PCI: VMD: Add quirk for AER to ignore source ID
PCI/AER: Add bus flag to skip source ID matching
Conflicts:
drivers/pci/probe.c
Diffstat (limited to 'drivers/pci/probe.c')
| -rw-r--r-- | drivers/pci/probe.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c index e2e424472058..ab002671fa60 100644 --- a/drivers/pci/probe.c +++ b/drivers/pci/probe.c @@ -1666,10 +1666,11 @@ static void pci_init_capabilities(struct pci_dev *dev) /* Enable ACS P2P upstream forwarding */ pci_enable_acs(dev); - pci_cleanup_aer_error_status_regs(dev); - /* Precision Time Measurement */ pci_ptm_init(dev); + + /* Advanced Error Reporting */ + pci_aer_init(dev); } /* |