1 files changed, 18 insertions, 8 deletions

diff --git a/drivers/pci/pci.c b/drivers/pci/pci.c
index 3b38e98e68df..f4587f6f8739 100644
--- a/drivers/pci/pci.c
+++ b/drivers/pci/pci.c
@@ -4143,6 +4143,12 @@ static void pci_reset_notify(struct pci_dev *dev, bool prepare)
 {
         const struct pci_error_handlers *err_handler =
                         dev->driver ? dev->driver->err_handler : NULL;
+
+        /*
+         * dev->driver->err_handler->reset_notify() is protected against
+         * races with ->remove() by the device lock, which must be held by
+         * the caller.
+         */
         if (err_handler && err_handler->reset_notify)
                 err_handler->reset_notify(dev, prepare);
 }
@@ -4278,11 +4284,13 @@ int pci_reset_function(struct pci_dev *dev)
         if (rc)
                 return rc;
 
+        pci_dev_lock(dev);
         pci_dev_save_and_disable(dev);
 
-        rc = pci_dev_reset(dev, 0);
+        rc = __pci_dev_reset(dev, 0);
 
         pci_dev_restore(dev);
+        pci_dev_unlock(dev);
 
         return rc;
 }
@@ -4302,16 +4310,14 @@ int pci_try_reset_function(struct pci_dev *dev)
         if (rc)
                 return rc;
 
-        pci_dev_save_and_disable(dev);
+        if (!pci_dev_trylock(dev))
+                return -EAGAIN;
 
-        if (pci_dev_trylock(dev)) {
-                rc = __pci_dev_reset(dev, 0);
-                pci_dev_unlock(dev);
-        } else
-                rc = -EAGAIN;
+        pci_dev_save_and_disable(dev);
+        rc = __pci_dev_reset(dev, 0);
+        pci_dev_unlock(dev);
 
         pci_dev_restore(dev);
-
         return rc;
 }
 EXPORT_SYMBOL_GPL(pci_try_reset_function);
@@ -4461,7 +4467,9 @@ static void pci_bus_save_and_disable(struct pci_bus *bus)
         struct pci_dev *dev;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
+                pci_dev_lock(dev);
                 pci_dev_save_and_disable(dev);
+                pci_dev_unlock(dev);
                 if (dev->subordinate)
                         pci_bus_save_and_disable(dev->subordinate);
         }
@@ -4476,7 +4484,9 @@ static void pci_bus_restore(struct pci_bus *bus)
         struct pci_dev *dev;
 
         list_for_each_entry(dev, &bus->devices, bus_list) {
+                pci_dev_lock(dev);
                 pci_dev_restore(dev);
+                pci_dev_unlock(dev);
                 if (dev->subordinate)
                         pci_bus_restore(dev->subordinate);
         }