UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

PCI/AER: Don't parse HEST table for non-PCIe devices 

AER is a PCIe-only capability, so there's no point in trying to match
a HEST PCIe structure with a non-PCIe device.

Previously, a HEST global AER bridge entry (type 8) could incorrectly
match *any* bridge, even a legacy PCI-PCI bridge, and a non-global
HEST entry could match a legacy PCI device.

Tested-by: Betty Dall <betty.dall@hp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>
This commit is contained in:
Bjorn Helgaas 2013-06-06 12:10:46 -06:00
parent f722406faa
commit 8b8d2b658f
1 changed files with 4 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
drivers/pci/pcie/aer/aerdrv_acpi.c
View File

@ -59,8 +59,7 @@ static int aer_hest_parse(struct acpi_hest_header *hest_hdr, void *data)
p = (struct acpi_hest_aer_common *)(hest_hdr + 1); p = (struct acpi_hest_aer_common *)(hest_hdr + 1);
if (p->flags & ACPI_HEST_GLOBAL) { if (p->flags & ACPI_HEST_GLOBAL) {
if ((pci_is_pcie(info->pci_dev) && if ((pci_pcie_type(info->pci_dev) == pcie_type) || bridge)
pci_pcie_type(info->pci_dev) == pcie_type) || bridge)
ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST); ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
} else } else
if (hest_match_pci(p, info->pci_dev)) if (hest_match_pci(p, info->pci_dev))
@ -89,6 +88,9 @@ static void aer_set_firmware_first(struct pci_dev *pci_dev)
int pcie_aer_get_firmware_first(struct pci_dev *dev) int pcie_aer_get_firmware_first(struct pci_dev *dev)
{ {
if (!pci_is_pcie(dev))
return 0;
if (!dev->__aer_firmware_first_valid) if (!dev->__aer_firmware_first_valid)
aer_set_firmware_first(dev); aer_set_firmware_first(dev);
return dev->__aer_firmware_first; return dev->__aer_firmware_first;