summaryrefslogtreecommitdiffstats
path: root/drivers/pci
diff options
context:
space:
mode:
authorBjorn Helgaas <bhelgaas@google.com>2014-01-13 16:46:15 -0700
committerBjorn Helgaas <bhelgaas@google.com>2014-01-13 16:46:15 -0700
commit6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2 (patch)
treec5bee117d8ae1b20e6f9de393c382430ecc7faf5 /drivers/pci
parent96702be560374ee7e7139a34cab03554129abbb4 (diff)
parent339c0fc58618b717565f109d68da50c5bc1a0510 (diff)
downloadtalos-obmc-linux-6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2.tar.gz
talos-obmc-linux-6b9bd1e3ee8f23b55d407becf4f6f422ec4610f2.zip
Merge branch 'pci/aer' into next
* pci/aer: PCI/AER: Support ACPI HEST AER error sources for PCI domains other than 0 ACPICA: Add helper macros to extract bus/segment numbers from HEST table.
Diffstat (limited to 'drivers/pci')
-rw-r--r--drivers/pci/pcie/aer/aerdrv_acpi.c8
1 files changed, 4 insertions, 4 deletions
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 4d6991794fa2..01906576ab91 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -23,10 +23,10 @@
static inline int hest_match_pci(struct acpi_hest_aer_common *p,
struct pci_dev *pci)
{
- return (0 == pci_domain_nr(pci->bus) &&
- p->bus == pci->bus->number &&
- p->device == PCI_SLOT(pci->devfn) &&
- p->function == PCI_FUNC(pci->devfn));
+ return ACPI_HEST_SEGMENT(p->bus) == pci_domain_nr(pci->bus) &&
+ ACPI_HEST_BUS(p->bus) == pci->bus->number &&
+ p->device == PCI_SLOT(pci->devfn) &&
+ p->function == PCI_FUNC(pci->devfn);
}
static inline bool hest_match_type(struct acpi_hest_header *hest_hdr,
OpenPOWER on IntegriCloud