1 files changed, 18 insertions, 12 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 0c4f641b7be1..177a50ff6454 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -1151,8 +1151,7 @@ int pci_reenable_device(struct pci_dev *dev)
         return 0;
 }
 
-static int __pci_enable_device_flags(struct pci_dev *dev,
-                                     resource_size_t flags)
+static int pci_enable_device_flags(struct pci_dev *dev, unsigned long flags)
 {
         int err;
         int i, bars = 0;
@@ -1196,7 +1195,7 @@ static int __pci_enable_device_flags(struct pci_dev *dev,
  */
 int pci_enable_device_io(struct pci_dev *dev)
 {
-        return __pci_enable_device_flags(dev, IORESOURCE_IO);
+        return pci_enable_device_flags(dev, IORESOURCE_IO);
 }
 
 /**
@@ -1209,7 +1208,7 @@ int pci_enable_device_io(struct pci_dev *dev)
  */
 int pci_enable_device_mem(struct pci_dev *dev)
 {
-        return __pci_enable_device_flags(dev, IORESOURCE_MEM);
+        return pci_enable_device_flags(dev, IORESOURCE_MEM);
 }
 
 /**
@@ -1225,7 +1224,7 @@ int pci_enable_device_mem(struct pci_dev *dev)
  */
 int pci_enable_device(struct pci_dev *dev)
 {
-        return __pci_enable_device_flags(dev, IORESOURCE_MEM | IORESOURCE_IO);
+        return pci_enable_device_flags(dev, IORESOURCE_MEM | IORESOURCE_IO);
 }
 
 /*
@@ -2043,10 +2042,13 @@ void pci_free_cap_save_buffers(struct pci_dev *dev)
 }
 
 /**
- * pci_enable_ari - enable ARI forwarding if hardware support it
+ * pci_configure_ari - enable or disable ARI forwarding
  * @dev: the PCI device
+ *
+ * If @dev and its upstream bridge both support ARI, enable ARI in the
+ * bridge.  Otherwise, disable ARI in the bridge.
  */
-void pci_enable_ari(struct pci_dev *dev)
+void pci_configure_ari(struct pci_dev *dev)
 {
         u32 cap;
         struct pci_dev *bridge;
@@ -2054,9 +2056,6 @@ void pci_enable_ari(struct pci_dev *dev)
         if (pcie_ari_disabled || !pci_is_pcie(dev) || dev->devfn)
                 return;
 
-        if (!pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI))
-                return;
-
         bridge = dev->bus->self;
         if (!bridge)
                 return;
@@ -2065,8 +2064,15 @@ void pci_enable_ari(struct pci_dev *dev)
         if (!(cap & PCI_EXP_DEVCAP2_ARI))
                 return;
 
-        pcie_capability_set_word(bridge, PCI_EXP_DEVCTL2, PCI_EXP_DEVCTL2_ARI);
-        bridge->ari_enabled = 1;
+        if (pci_find_ext_capability(dev, PCI_EXT_CAP_ID_ARI)) {
+                pcie_capability_set_word(bridge, PCI_EXP_DEVCTL2,
+                                         PCI_EXP_DEVCTL2_ARI);
+                bridge->ari_enabled = 1;
+        } else {
+                pcie_capability_clear_word(bridge, PCI_EXP_DEVCTL2,
+                                           PCI_EXP_DEVCTL2_ARI);
+                bridge->ari_enabled = 0;
+        }
 }
 
 /**