4 files changed, 78 insertions, 58 deletions

diff --git a/drivers/pci/pcie/aer/aer_inject.c b/drivers/pci/pcie/aer/aer_inject.c
index 62d15f652bb6..7fcd5331b14c 100644
--- a/drivers/pci/pcie/aer/aer_inject.c
+++ b/drivers/pci/pcie/aer/aer_inject.c
@@ -23,6 +23,7 @@
 #include <linux/pci.h>
 #include <linux/fs.h>
 #include <linux/uaccess.h>
+#include <linux/stddef.h>
 #include "aerdrv.h"
 
 struct aer_error_inj {
@@ -35,10 +36,12 @@ struct aer_error_inj {
         u32 header_log1;
         u32 header_log2;
         u32 header_log3;
+        u16 domain;
 };
 
 struct aer_error {
         struct list_head list;
+        u16 domain;
         unsigned int bus;
         unsigned int devfn;
         int pos_cap_err;
@@ -66,22 +69,27 @@ static LIST_HEAD(pci_bus_ops_list);
 /* Protect einjected and pci_bus_ops_list */
 static DEFINE_SPINLOCK(inject_lock);
 
-static void aer_error_init(struct aer_error *err, unsigned int bus,
-                           unsigned int devfn, int pos_cap_err)
+static void aer_error_init(struct aer_error *err, u16 domain,
+                           unsigned int bus, unsigned int devfn,
+                           int pos_cap_err)
 {
         INIT_LIST_HEAD(&err->list);
+        err->domain = domain;
         err->bus = bus;
         err->devfn = devfn;
         err->pos_cap_err = pos_cap_err;
 }
 
 /* inject_lock must be held before calling */
-static struct aer_error *__find_aer_error(unsigned int bus, unsigned int devfn)
+static struct aer_error *__find_aer_error(u16 domain, unsigned int bus,
+                                          unsigned int devfn)
 {
         struct aer_error *err;
 
         list_for_each_entry(err, &einjected, list) {
-                if (bus == err->bus && devfn == err->devfn)
+                if (domain == err->domain &&
+                    bus == err->bus &&
+                    devfn == err->devfn)
                         return err;
         }
         return NULL;
@@ -90,7 +98,10 @@ static struct aer_error *__find_aer_error(unsigned int bus, unsigned int devfn)
 /* inject_lock must be held before calling */
 static struct aer_error *__find_aer_error_by_dev(struct pci_dev *dev)
 {
-        return __find_aer_error(dev->bus->number, dev->devfn);
+        int domain = pci_domain_nr(dev->bus);
+        if (domain < 0)
+                return NULL;
+        return __find_aer_error((u16)domain, dev->bus->number, dev->devfn);
 }
 
 /* inject_lock must be held before calling */
@@ -172,11 +183,15 @@ static int pci_read_aer(struct pci_bus *bus, unsigned int devfn, int where,
         struct aer_error *err;
         unsigned long flags;
         struct pci_ops *ops;
+        int domain;
 
         spin_lock_irqsave(&inject_lock, flags);
         if (size != sizeof(u32))
                 goto out;
-        err = __find_aer_error(bus->number, devfn);
+        domain = pci_domain_nr(bus);
+        if (domain < 0)
+                goto out;
+        err = __find_aer_error((u16)domain, bus->number, devfn);
         if (!err)
                 goto out;
 
@@ -200,11 +215,15 @@ int pci_write_aer(struct pci_bus *bus, unsigned int devfn, int where, int size,
         unsigned long flags;
         int rw1cs;
         struct pci_ops *ops;
+        int domain;
 
         spin_lock_irqsave(&inject_lock, flags);
         if (size != sizeof(u32))
                 goto out;
-        err = __find_aer_error(bus->number, devfn);
+        domain = pci_domain_nr(bus);
+        if (domain < 0)
+                goto out;
+        err = __find_aer_error((u16)domain, bus->number, devfn);
         if (!err)
                 goto out;
 
@@ -262,7 +281,7 @@ out:
 static struct pci_dev *pcie_find_root_port(struct pci_dev *dev)
 {
         while (1) {
-                if (!dev->is_pcie)
+                if (!pci_is_pcie(dev))
                         break;
                 if (dev->pcie_type == PCI_EXP_TYPE_ROOT_PORT)
                         return dev;
@@ -305,25 +324,25 @@ static int aer_inject(struct aer_error_inj *einj)
         u32 sever;
         int ret = 0;
 
-        dev = pci_get_bus_and_slot(einj->bus, devfn);
+        dev = pci_get_domain_bus_and_slot((int)einj->domain, einj->bus, devfn);
         if (!dev)
-                return -EINVAL;
+                return -ENODEV;
         rpdev = pcie_find_root_port(dev);
         if (!rpdev) {
-                ret = -EINVAL;
+                ret = -ENOTTY;
                 goto out_put;
         }
 
         pos_cap_err = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
         if (!pos_cap_err) {
-                ret = -EIO;
+                ret = -ENOTTY;
                 goto out_put;
         }
         pci_read_config_dword(dev, pos_cap_err + PCI_ERR_UNCOR_SEVER, &sever);
 
         rp_pos_cap_err = pci_find_ext_capability(rpdev, PCI_EXT_CAP_ID_ERR);
         if (!rp_pos_cap_err) {
-                ret = -EIO;
+                ret = -ENOTTY;
                 goto out_put;
         }
 
@@ -344,7 +363,8 @@ static int aer_inject(struct aer_error_inj *einj)
         if (!err) {
                 err = err_alloc;
                 err_alloc = NULL;
-                aer_error_init(err, einj->bus, devfn, pos_cap_err);
+                aer_error_init(err, einj->domain, einj->bus, devfn,
+                               pos_cap_err);
                 list_add(&err->list, &einjected);
         }
         err->uncor_status |= einj->uncor_status;
@@ -358,7 +378,8 @@ static int aer_inject(struct aer_error_inj *einj)
         if (!rperr) {
                 rperr = rperr_alloc;
                 rperr_alloc = NULL;
-                aer_error_init(rperr, rpdev->bus->number, rpdev->devfn,
+                aer_error_init(rperr, pci_domain_nr(rpdev->bus),
+                               rpdev->bus->number, rpdev->devfn,
                                rp_pos_cap_err);
                 list_add(&rperr->list, &einjected);
         }
@@ -411,10 +432,11 @@ static ssize_t aer_inject_write(struct file *filp, const char __user *ubuf,
 
         if (!capable(CAP_SYS_ADMIN))
                 return -EPERM;
-
-        if (usize != sizeof(struct aer_error_inj))
+        if (usize < offsetof(struct aer_error_inj, domain) ||
+            usize > sizeof(einj))
                 return -EINVAL;
 
+        memset(&einj, 0, sizeof(einj));
         if (copy_from_user(&einj, ubuf, usize))
                 return -EFAULT;
 
@@ -452,7 +474,7 @@ static void __exit aer_inject_exit(void)
         }
 
         spin_lock_irqsave(&inject_lock, flags);
-        list_for_each_entry_safe(err, err_next, &pci_bus_ops_list, list) {
+        list_for_each_entry_safe(err, err_next, &einjected, list) {
                 list_del(&err->list);
                 kfree(err);
         }
diff --git a/drivers/pci/pcie/aer/aerdrv.c b/drivers/pci/pcie/aer/aerdrv.c
index 40c3cc5d1caf..97a345927b55 100644
--- a/drivers/pci/pcie/aer/aerdrv.c
+++ b/drivers/pci/pcie/aer/aerdrv.c
@@ -53,7 +53,7 @@ static struct pci_error_handlers aer_error_handlers = {
 
 static struct pcie_port_service_driver aerdriver = {
         .name           = "aer",
-        .port_type      = PCIE_RC_PORT,
+        .port_type      = PCI_EXP_TYPE_ROOT_PORT,
         .service        = PCIE_PORT_SERVICE_AER,
 
         .probe          = aer_probe,
@@ -295,7 +295,7 @@ static void aer_error_resume(struct pci_dev *dev)
         u16 reg16;
 
         /* Clean up Root device status */
-        pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+        pos = pci_pcie_cap(dev);
         pci_read_config_word(dev, pos + PCI_EXP_DEVSTA, &reg16);
         pci_write_config_word(dev, pos + PCI_EXP_DEVSTA, reg16);
 
diff --git a/drivers/pci/pcie/aer/aerdrv_core.c b/drivers/pci/pcie/aer/aerdrv_core.c
index 9f5ccbeb4fa5..ae672ca80333 100644
--- a/drivers/pci/pcie/aer/aerdrv_core.c
+++ b/drivers/pci/pcie/aer/aerdrv_core.c
@@ -35,11 +35,14 @@ int pci_enable_pcie_error_reporting(struct pci_dev *dev)
         u16 reg16 = 0;
         int pos;
 
+        if (dev->aer_firmware_first)
+                return -EIO;
+
         pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
         if (!pos)
                 return -EIO;
 
-        pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+        pos = pci_pcie_cap(dev);
         if (!pos)
                 return -EIO;
 
@@ -60,7 +63,10 @@ int pci_disable_pcie_error_reporting(struct pci_dev *dev)
         u16 reg16 = 0;
         int pos;
 
-        pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+        if (dev->aer_firmware_first)
+                return -EIO;
+
+        pos = pci_pcie_cap(dev);
         if (!pos)
                 return -EIO;
 
@@ -78,48 +84,27 @@ EXPORT_SYMBOL_GPL(pci_disable_pcie_error_reporting);
 int pci_cleanup_aer_uncorrect_error_status(struct pci_dev *dev)
 {
         int pos;
-        u32 status, mask;
+        u32 status;
 
         pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
         if (!pos)
                 return -EIO;
 
         pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, &status);
-        pci_read_config_dword(dev, pos + PCI_ERR_UNCOR_SEVER, &mask);
-        if (dev->error_state == pci_channel_io_normal)
-                status &= ~mask; /* Clear corresponding nonfatal bits */
-        else
-                status &= mask; /* Clear corresponding fatal bits */
-        pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);
+        if (status)
+                pci_write_config_dword(dev, pos + PCI_ERR_UNCOR_STATUS, status);
 
         return 0;
 }
 EXPORT_SYMBOL_GPL(pci_cleanup_aer_uncorrect_error_status);
 
-#if 0
-int pci_cleanup_aer_correct_error_status(struct pci_dev *dev)
-{
-        int pos;
-        u32 status;
-
-        pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
-        if (!pos)
-                return -EIO;
-
-        pci_read_config_dword(dev, pos + PCI_ERR_COR_STATUS, &status);
-        pci_write_config_dword(dev, pos + PCI_ERR_COR_STATUS, status);
-
-        return 0;
-}
-#endif  /*  0  */
-
 static int set_device_error_reporting(struct pci_dev *dev, void *data)
 {
         bool enable = *((bool *)data);
 
-        if (dev->pcie_type == PCIE_RC_PORT ||
-            dev->pcie_type == PCIE_SW_UPSTREAM_PORT ||
-            dev->pcie_type == PCIE_SW_DOWNSTREAM_PORT) {
+        if ((dev->pcie_type == PCI_EXP_TYPE_ROOT_PORT) ||
+            (dev->pcie_type == PCI_EXP_TYPE_UPSTREAM) ||
+            (dev->pcie_type == PCI_EXP_TYPE_DOWNSTREAM)) {
                 if (enable)
                         pci_enable_pcie_error_reporting(dev);
                 else
@@ -218,7 +203,7 @@ static int find_device_iter(struct pci_dev *dev, void *data)
          */
         if (atomic_read(&dev->enable_cnt) == 0)
                 return 0;
-        pos = pci_find_capability(dev, PCI_CAP_ID_EXP);
+        pos = pci_pcie_cap(dev);
         if (!pos)
                 return 0;
         /* Check if AER is enabled */
@@ -431,10 +416,9 @@ static int find_aer_service_iter(struct device *device, void *data)
         result = (struct find_aer_service_data *) data;
 
         if (device->bus == &pcie_port_bus_type) {
-                struct pcie_port_data *port_data;
+                struct pcie_device *pcie = to_pcie_device(device);
 
-                port_data = pci_get_drvdata(to_pcie_device(device)->port);
-                if (port_data->port_type == PCIE_SW_DOWNSTREAM_PORT)
+                if (pcie->port->pcie_type == PCI_EXP_TYPE_DOWNSTREAM)
                         result->is_downstream = 1;
 
                 driver = device->driver;
@@ -612,7 +596,7 @@ void aer_enable_rootport(struct aer_rpc *rpc)
         u16 reg16;
         u32 reg32;
 
-        pos = pci_find_capability(pdev, PCI_CAP_ID_EXP);
+        pos = pci_pcie_cap(pdev);
         /* Clear PCIE Capability's Device Status */
         pci_read_config_word(pdev, pos+PCI_EXP_DEVSTA, &reg16);
         pci_write_config_word(pdev, pos+PCI_EXP_DEVSTA, reg16);
@@ -874,8 +858,22 @@ void aer_delete_rootport(struct aer_rpc *rpc)
  */
 int aer_init(struct pcie_device *dev)
 {
-        if (aer_osc_setup(dev) && !forceload)
-                return -ENXIO;
+        if (dev->port->aer_firmware_first) {
+                dev_printk(KERN_DEBUG, &dev->device,
+                           "PCIe errors handled by platform firmware.\n");
+                goto out;
+        }
+
+        if (aer_osc_setup(dev))
+                goto out;
 
         return 0;
+out:
+        if (forceload) {
+                dev_printk(KERN_DEBUG, &dev->device,
+                           "aerdrv forceload requested.\n");
+                dev->port->aer_firmware_first = 0;
+                return 0;
+        }
+        return -ENXIO;
 }
diff --git a/drivers/pci/pcie/aer/ecrc.c b/drivers/pci/pcie/aer/ecrc.c
index a928d8ab6bda..a2747a663bc9 100644
--- a/drivers/pci/pcie/aer/ecrc.c
+++ b/drivers/pci/pcie/aer/ecrc.c
@@ -51,7 +51,7 @@ static int enable_ecrc_checking(struct pci_dev *dev)
         int pos;
         u32 reg32;
 
-        if (!dev->is_pcie)
+        if (!pci_is_pcie(dev))
                 return -ENODEV;
 
         pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);
@@ -79,7 +79,7 @@ static int disable_ecrc_checking(struct pci_dev *dev)
         int pos;
         u32 reg32;
 
-        if (!dev->is_pcie)
+        if (!pci_is_pcie(dev))
                 return -ENODEV;
 
         pos = pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ERR);