Merge tag 'stm-for-greg-20160714' of git://git.kernel.org/pub/scm/linux/kernel/git/ash/stm into char-misc-next

Alexander writes:

intel_th: Fixes -t://git.kernel.org/pub/scm/linux/kernel/git/ash/stm.git
tags/stm-for-greg-20160714
stable

These are:
 * a fix for a modprobe time deadlock
 * a new PCI ID for Kaby Lake PCH-H

3 files changed, 42 insertions, 1 deletions

diff --git a/drivers/hwtracing/intel_th/core.c b/drivers/hwtracing/intel_th/core.c
index fdd17636d109..6f0a51a2c6ec 100644
--- a/drivers/hwtracing/intel_th/core.c
+++ b/drivers/hwtracing/intel_th/core.c
@@ -490,6 +490,38 @@ static struct intel_th_subdevice {
         },
 };
 
+#ifdef CONFIG_MODULES
+static void __intel_th_request_hub_module(struct work_struct *work)
+{
+        struct intel_th *th = container_of(work, struct intel_th,
+                                           request_module_work);
+
+        request_module("intel_th_%s", th->hub->name);
+}
+
+static int intel_th_request_hub_module(struct intel_th *th)
+{
+        INIT_WORK(&th->request_module_work, __intel_th_request_hub_module);
+        schedule_work(&th->request_module_work);
+
+        return 0;
+}
+
+static void intel_th_request_hub_module_flush(struct intel_th *th)
+{
+        flush_work(&th->request_module_work);
+}
+#else
+static inline int intel_th_request_hub_module(struct intel_th *th)
+{
+        return -EINVAL;
+}
+
+static inline void intel_th_request_hub_module_flush(struct intel_th *th)
+{
+}
+#endif /* CONFIG_MODULES */
+
 static int intel_th_populate(struct intel_th *th, struct resource *devres,
                              unsigned int ndevres, int irq)
 {
@@ -560,7 +592,7 @@ static int intel_th_populate(struct intel_th *th, struct resource *devres,
                 /* need switch driver to be loaded to enumerate the rest */
                 if (subdev->type == INTEL_TH_SWITCH && !req) {
                         th->hub = thdev;
-                        err = request_module("intel_th_%s", subdev->name);
+                        err = intel_th_request_hub_module(th);
                         if (!err)
                                 req++;
                 }
@@ -683,6 +715,7 @@ void intel_th_free(struct intel_th *th)
 {
         int i;
 
+        intel_th_request_hub_module_flush(th);
         for (i = 0; i < TH_SUBDEVICE_MAX; i++)
                 if (th->thdev[i] != th->hub)
                         intel_th_device_remove(th->thdev[i]);
diff --git a/drivers/hwtracing/intel_th/intel_th.h b/drivers/hwtracing/intel_th/intel_th.h
index 20f57aa4d8f5..4c195786bf1f 100644
--- a/drivers/hwtracing/intel_th/intel_th.h
+++ b/drivers/hwtracing/intel_th/intel_th.h
@@ -208,6 +208,9 @@ struct intel_th {
 
         int                     id;
         int                     major;
+#ifdef CONFIG_MODULES
+        struct work_struct      request_module_work;
+#endif /* CONFIG_MODULES */
 #ifdef CONFIG_INTEL_TH_DEBUG
         struct dentry           *dbg;
 #endif
diff --git a/drivers/hwtracing/intel_th/pci.c b/drivers/hwtracing/intel_th/pci.c
index 5e25c7eb31d3..0bba3842336e 100644
--- a/drivers/hwtracing/intel_th/pci.c
+++ b/drivers/hwtracing/intel_th/pci.c
@@ -80,6 +80,11 @@ static const struct pci_device_id intel_th_pci_id_table[] = {
                 PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0x1a8e),
                 .driver_data = (kernel_ulong_t)0,
         },
+        {
+                /* Kaby Lake PCH-H */
+                PCI_DEVICE(PCI_VENDOR_ID_INTEL, 0xa2a6),
+                .driver_data = (kernel_ulong_t)0,
+        },
         { 0 },
 };