14 files changed, 343 insertions, 156 deletions

diff --git a/drivers/acpi/nfit/core.c b/drivers/acpi/nfit/core.c
index c02fa27dd3f3..1413324982f0 100644
--- a/drivers/acpi/nfit/core.c
+++ b/drivers/acpi/nfit/core.c
@@ -1282,7 +1282,7 @@ static ssize_t hw_error_scrub_store(struct device *dev,
         if (rc)
                 return rc;
 
-        device_lock(dev);
+        nfit_device_lock(dev);
         nd_desc = dev_get_drvdata(dev);
         if (nd_desc) {
                 struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
@@ -1299,7 +1299,7 @@ static ssize_t hw_error_scrub_store(struct device *dev,
                         break;
                 }
         }
-        device_unlock(dev);
+        nfit_device_unlock(dev);
         if (rc)
                 return rc;
         return size;
@@ -1319,7 +1319,7 @@ static ssize_t scrub_show(struct device *dev,
         ssize_t rc = -ENXIO;
         bool busy;
 
-        device_lock(dev);
+        nfit_device_lock(dev);
         nd_desc = dev_get_drvdata(dev);
         if (!nd_desc) {
                 device_unlock(dev);
@@ -1339,7 +1339,7 @@ static ssize_t scrub_show(struct device *dev,
         }
 
         mutex_unlock(&acpi_desc->init_mutex);
-        device_unlock(dev);
+        nfit_device_unlock(dev);
         return rc;
 }
 
@@ -1356,14 +1356,14 @@ static ssize_t scrub_store(struct device *dev,
         if (val != 1)
                 return -EINVAL;
 
-        device_lock(dev);
+        nfit_device_lock(dev);
         nd_desc = dev_get_drvdata(dev);
         if (nd_desc) {
                 struct acpi_nfit_desc *acpi_desc = to_acpi_desc(nd_desc);
 
                 rc = acpi_nfit_ars_rescan(acpi_desc, ARS_REQ_LONG);
         }
-        device_unlock(dev);
+        nfit_device_unlock(dev);
         if (rc)
                 return rc;
         return size;
@@ -1749,9 +1749,9 @@ static void acpi_nvdimm_notify(acpi_handle handle, u32 event, void *data)
         struct acpi_device *adev = data;
         struct device *dev = &adev->dev;
 
-        device_lock(dev->parent);
+        nfit_device_lock(dev->parent);
         __acpi_nvdimm_notify(dev, event);
-        device_unlock(dev->parent);
+        nfit_device_unlock(dev->parent);
 }
 
 static bool acpi_nvdimm_has_method(struct acpi_device *adev, char *method)
@@ -3457,8 +3457,8 @@ static int acpi_nfit_flush_probe(struct nvdimm_bus_descriptor *nd_desc)
         struct device *dev = acpi_desc->dev;
 
         /* Bounce the device lock to flush acpi_nfit_add / acpi_nfit_notify */
-        device_lock(dev);
-        device_unlock(dev);
+        nfit_device_lock(dev);
+        nfit_device_unlock(dev);
 
         /* Bounce the init_mutex to complete initial registration */
         mutex_lock(&acpi_desc->init_mutex);
@@ -3602,8 +3602,8 @@ void acpi_nfit_shutdown(void *data)
          * acpi_nfit_ars_rescan() submissions have had a chance to
          * either submit or see ->cancel set.
          */
-        device_lock(bus_dev);
-        device_unlock(bus_dev);
+        nfit_device_lock(bus_dev);
+        nfit_device_unlock(bus_dev);
 
         flush_workqueue(nfit_wq);
 }
@@ -3746,9 +3746,9 @@ EXPORT_SYMBOL_GPL(__acpi_nfit_notify);
 
 static void acpi_nfit_notify(struct acpi_device *adev, u32 event)
 {
-        device_lock(&adev->dev);
+        nfit_device_lock(&adev->dev);
         __acpi_nfit_notify(&adev->dev, adev->handle, event);
-        device_unlock(&adev->dev);
+        nfit_device_unlock(&adev->dev);
 }
 
 static const struct acpi_device_id acpi_nfit_ids[] = {
diff --git a/drivers/acpi/nfit/nfit.h b/drivers/acpi/nfit/nfit.h
index 6ee2b02af73e..24241941181c 100644
--- a/drivers/acpi/nfit/nfit.h
+++ b/drivers/acpi/nfit/nfit.h
@@ -312,6 +312,30 @@ static inline struct acpi_nfit_desc *to_acpi_desc(
         return container_of(nd_desc, struct acpi_nfit_desc, nd_desc);
 }
 
+#ifdef CONFIG_PROVE_LOCKING
+static inline void nfit_device_lock(struct device *dev)
+{
+        device_lock(dev);
+        mutex_lock(&dev->lockdep_mutex);
+}
+
+static inline void nfit_device_unlock(struct device *dev)
+{
+        mutex_unlock(&dev->lockdep_mutex);
+        device_unlock(dev);
+}
+#else
+static inline void nfit_device_lock(struct device *dev)
+{
+        device_lock(dev);
+}
+
+static inline void nfit_device_unlock(struct device *dev)
+{
+        device_unlock(dev);
+}
+#endif
+
 const guid_t *to_nfit_uuid(enum nfit_uuids id);
 int acpi_nfit_init(struct acpi_nfit_desc *acpi_desc, void *nfit, acpi_size sz);
 void acpi_nfit_shutdown(void *data);
diff --git a/drivers/base/core.c b/drivers/base/core.c
index da84a73f2ba6..636058bbf48a 100644
--- a/drivers/base/core.c
+++ b/drivers/base/core.c
@@ -1663,6 +1663,9 @@ void device_initialize(struct device *dev)
         kobject_init(&dev->kobj, &device_ktype);
         INIT_LIST_HEAD(&dev->dma_pools);
         mutex_init(&dev->mutex);
+#ifdef CONFIG_PROVE_LOCKING
+        mutex_init(&dev->lockdep_mutex);
+#endif
         lockdep_set_novalidate_class(&dev->mutex);
         spin_lock_init(&dev->devres_lock);
         INIT_LIST_HEAD(&dev->devres_head);
@@ -2211,6 +2214,24 @@ void put_device(struct device *dev)
 }
 EXPORT_SYMBOL_GPL(put_device);
 
+bool kill_device(struct device *dev)
+{
+        /*
+         * Require the device lock and set the "dead" flag to guarantee that
+         * the update behavior is consistent with the other bitfields near
+         * it and that we cannot have an asynchronous probe routine trying
+         * to run while we are tearing out the bus/class/sysfs from
+         * underneath the device.
+         */
+        lockdep_assert_held(&dev->mutex);
+
+        if (dev->p->dead)
+                return false;
+        dev->p->dead = true;
+        return true;
+}
+EXPORT_SYMBOL_GPL(kill_device);
+