PCI/AER: Ignore non-PCIe AER error sources in aer_hest_parse()

aer_set_firmware_first() searches the HEST for an error source descriptor
matching the specified PCI device.  It uses the apei_hest_parse() iterator
to call aer_hest_parse() for every descriptor in the HEST.

Previously, aer_hest_parse() incorrectly assumed every descriptor was for a
PCIe error source.  This patch adds a check to avoid that error.

[bhelgaas: factor check into helper, use in aer_hest_parse_aff(), changelog]
Signed-off-by: Betty Dall <betty.dall@hp.com>
Signed-off-by: Bjorn Helgaas <bhelgaas@google.com>

diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index cf611ab2193a618880e94303d9bdbe93cd1fdf7e..a23995749f1d1e72fb8b5c4cb5a532f2f67f4920 100644 (file)
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -50,12 +50,24 @@ struct aer_hest_parse_info {
        int firmware_first;
 };
 
+static int hest_source_is_pcie_aer(struct acpi_hest_header *hest_hdr)
+{
+       if (hest_hdr->type == ACPI_HEST_TYPE_AER_ROOT_PORT ||
+           hest_hdr->type == ACPI_HEST_TYPE_AER_ENDPOINT ||
+           hest_hdr->type == ACPI_HEST_TYPE_AER_BRIDGE)
+               return 1;
+       return 0;
+}
+
 static int aer_hest_parse(struct acpi_hest_header *hest_hdr, void *data)
 {
        struct aer_hest_parse_info *info = data;
        struct acpi_hest_aer_common *p;
        int ff;
 
+       if (!hest_source_is_pcie_aer(hest_hdr))
+               return 0;
+
        p = (struct acpi_hest_aer_common *)(hest_hdr + 1);
        ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
        if (p->flags & ACPI_HEST_GLOBAL) {
@@ -104,15 +116,12 @@ static int aer_hest_parse_aff(struct acpi_hest_header *hest_hdr, void *data)
        if (aer_firmware_first)
                return 0;
 
-       switch (hest_hdr->type) {
-       case ACPI_HEST_TYPE_AER_ROOT_PORT:
-       case ACPI_HEST_TYPE_AER_ENDPOINT:
-       case ACPI_HEST_TYPE_AER_BRIDGE:
-               p = (struct acpi_hest_aer_common *)(hest_hdr + 1);
-               aer_firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
-       default:
+       if (!hest_source_is_pcie_aer(hest_hdr))
                return 0;
-       }
+
+       p = (struct acpi_hest_aer_common *)(hest_hdr + 1);
+       aer_firmware_first = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
+       return 0;
 }
 
 /**