Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8b8d2b65 authored by Bjorn Helgaas's avatar Bjorn Helgaas
Browse files

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: default avatarBetty Dall <betty.dall@hp.com>
Signed-off-by: default avatarBjorn Helgaas <bhelgaas@google.com>
parent f722406f

drivers/pci/pcie/aer/aerdrv_acpi.c

+4 −2
Original line number Diff line number Diff line
@@ -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);

	if (p->flags & ACPI_HEST_GLOBAL) {

		if ((pci_is_pcie(info->pci_dev) &&

		     pci_pcie_type(info->pci_dev) == pcie_type) || bridge)

		if ((pci_pcie_type(info->pci_dev) == pcie_type) || bridge)

			ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);

	} else

		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)

{

	if (!pci_is_pcie(dev))

		return 0;



	if (!dev->__aer_firmware_first_valid)

		aer_set_firmware_first(dev);

	return dev->__aer_firmware_first;