4 files changed, 98 insertions, 12 deletions

diff --git a/drivers/pci/pcie/aer/aerdrv.h b/drivers/pci/pcie/aer/aerdrv.h
index bd833ea3ba49..7182c337aef1 100644
--- a/drivers/pci/pcie/aer/aerdrv.h
+++ b/drivers/pci/pcie/aer/aerdrv.h
@@ -134,4 +134,21 @@ static inline int aer_osc_setup(struct pcie_device *pciedev)
 }
 #endif
 
+#ifdef CONFIG_ACPI_APEI
+extern int pcie_aer_get_firmware_first(struct pci_dev *pci_dev);
+#else
+static inline int pcie_aer_get_firmware_first(struct pci_dev *pci_dev)
+{
+        if (pci_dev->__aer_firmware_first_valid)
+                return pci_dev->__aer_firmware_first;
+        return 0;
+}
+#endif
+
+static inline void pcie_aer_force_firmware_first(struct pci_dev *pci_dev,
+                                                 int enable)
+{
+        pci_dev->__aer_firmware_first = !!enable;
+        pci_dev->__aer_firmware_first_valid = 1;
+}
 #endif /* _AERDRV_H_ */
diff --git a/drivers/pci/pcie/aer/aerdrv_acpi.c b/drivers/pci/pcie/aer/aerdrv_acpi.c
index 04814087658d..f278d7b0d95d 100644
--- a/drivers/pci/pcie/aer/aerdrv_acpi.c
+++ b/drivers/pci/pcie/aer/aerdrv_acpi.c
@@ -16,6 +16,7 @@
 #include <linux/acpi.h>
 #include <linux/pci-acpi.h>
 #include <linux/delay.h>
+#include <acpi/apei.h>
 #include "aerdrv.h"
 
 /**
@@ -53,3 +54,79 @@ int aer_osc_setup(struct pcie_device *pciedev)
 
         return 0;
 }
+
+#ifdef CONFIG_ACPI_APEI
+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));
+}
+
+struct aer_hest_parse_info {
+        struct pci_dev *pci_dev;
+        int firmware_first;
+};
+
+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;
+        u8 pcie_type = 0;
+        u8 bridge = 0;
+        int ff = 0;
+
+        switch (hest_hdr->type) {
+        case ACPI_HEST_TYPE_AER_ROOT_PORT:
+                pcie_type = PCI_EXP_TYPE_ROOT_PORT;
+                break;
+        case ACPI_HEST_TYPE_AER_ENDPOINT:
+                pcie_type = PCI_EXP_TYPE_ENDPOINT;
+                break;
+        case ACPI_HEST_TYPE_AER_BRIDGE:
+                if ((info->pci_dev->class >> 16) == PCI_BASE_CLASS_BRIDGE)
+                        bridge = 1;
+                break;
+        default:
+                return 0;
+        }
+
+        p = (struct acpi_hest_aer_common *)(hest_hdr + 1);
+        if (p->flags & ACPI_HEST_GLOBAL) {
+                if ((info->pci_dev->is_pcie &&
+                     info->pci_dev->pcie_type == pcie_type) || bridge)
+                        ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
+        } else
+                if (hest_match_pci(p, info->pci_dev))
+                        ff = !!(p->flags & ACPI_HEST_FIRMWARE_FIRST);
+        info->firmware_first = ff;
+
+        return 0;
+}
+
+static void aer_set_firmware_first(struct pci_dev *pci_dev)
+{
+        int rc;
+        struct aer_hest_parse_info info = {
+                .pci_dev        = pci_dev,
+                .firmware_first = 0,
+        };
+
+        rc = apei_hest_parse(aer_hest_parse, &info);
+
+        if (rc)
+                pci_dev->__aer_firmware_first = 0;
+        else
+                pci_dev->__aer_firmware_first = info.firmware_first;
+        pci_dev->__aer_firmware_first_valid = 1;
+}
+
+int pcie_aer_get_firmware_first(struct pci_dev *dev)
+{
+        if (!dev->__aer_firmware_first_valid)
+                aer_set_firmware_first(dev);
+        return dev->__aer_firmware_first;
+}
+#endif
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index aceb04b67b60..586b6713e417 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -36,7 +36,7 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev)
         u16 reg16 = 0;
         int pos;
 
-        if (dev->aer_firmware_first)
+        if (pcie_aer_get_firmware_first(dev))
                 return -EIO;
 
         pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
@@ -64,7 +64,7 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev)
         u16 reg16 = 0;
         int pos;
 
-        if (dev->aer_firmware_first)
+        if (pcie_aer_get_firmware_first(dev))
                 return -EIO;
 
         pos = pci_pcie_cap(dev);
@@ -859,7 +859,7 @@ void aer_delete_rootport(struct aer_rpc *rpc)
  */
 int aer_init(struct pcie_device *dev)
 {
-        if (dev->port->aer_firmware_first) {
+        if (pcie_aer_get_firmware_first(dev->port)) {
                 dev_printk(KERN_DEBUG, &dev->device,
                            "PCIe errors handled by platform firmware.\n");
                 goto out;
@@ -873,7 +873,7 @@ out:
         if (forceload) {
                 dev_printk(KERN_DEBUG, &dev->device,
                            "aerdrv forceload requested.\n");
-                dev->port->aer_firmware_first = 0;
+                pcie_aer_force_firmware_first(dev->port, 0);
                 return 0;
         }
         return -ENXIO;
diff --git a/drivers/pci/probe.c b/drivers/pci/probe.c
index c82548afcd5c..f4adba2d1dd3 100644
--- a/drivers/pci/probe.c
+++ b/drivers/pci/probe.c
@@ -10,7 +10,6 @@
 #include <linux/module.h>
 #include <linux/cpumask.h>
 #include <linux/pci-aspm.h>
-#include <acpi/acpi_hest.h>
 #include "pci.h"
 
 #define CARDBUS_LATENCY_TIMER   176     /* secondary latency timer */
@@ -904,12 +903,6 @@ void set_pcie_hotplug_bridge(struct pci_dev *pdev)
                 pdev->is_hotplug_bridge = 1;
 }
 
-static void set_pci_aer_firmware_first(struct pci_dev *pdev)
-{
-        if (acpi_hest_firmware_first_pci(pdev))
-                pdev->aer_firmware_first = 1;
-}
-
 #define LEGACY_IO_RESOURCE      (IORESOURCE_IO | IORESOURCE_PCI_FIXED)
 
 /**
@@ -939,7 +932,6 @@ int pci_setup_device(struct pci_dev *dev)
         dev->multifunction = !!(hdr_type & 0x80);
         dev->error_state = pci_channel_io_normal;
         set_pcie_port_type(dev);
-        set_pci_aer_firmware_first(dev);
 
         list_for_each_entry(slot, &dev->bus->slots, list)
                 if (PCI_SLOT(dev->devfn) == slot->number)