IB/hfi1: Do not destroy link_wq when the device is shut down
authorKaike Wan <kaike.wan@intel.com>
Tue, 23 Jun 2020 20:40:53 +0000 (16:40 -0400)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 16 Jul 2020 06:16:42 +0000 (08:16 +0200)
commit 2315ec12ee8e8257bb335654c62e0cae71dc278d upstream.

The workqueue link_wq should only be destroyed when the hfi1 driver is
unloaded, not when the device is shut down.

Fixes: 71d47008ca1b ("IB/hfi1: Create workqueue for link events")
Link: https://lore.kernel.org/r/20200623204053.107638.70315.stgit@awfm-01.aw.intel.com
Cc: <stable@vger.kernel.org>
Reviewed-by: Mike Marciniszyn <mike.marciniszyn@intel.com>
Signed-off-by: Kaike Wan <kaike.wan@intel.com>
Signed-off-by: Dennis Dalessandro <dennis.dalessandro@intel.com>
Signed-off-by: Jason Gunthorpe <jgg@nvidia.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/infiniband/hw/hfi1/init.c

index d5165a6179d432b5bf4a54ed4f80906ed5b57317..fbff6b2f00e71ef21ef6b2338f24c150f907d81f 100644 (file)
@@ -860,6 +860,10 @@ static void destroy_workqueues(struct hfi1_devdata *dd)
                        destroy_workqueue(ppd->hfi1_wq);
                        ppd->hfi1_wq = NULL;
                }
+               if (ppd->link_wq) {
+                       destroy_workqueue(ppd->link_wq);
+                       ppd->link_wq = NULL;
+               }
        }
 }
 
@@ -1136,14 +1140,10 @@ static void shutdown_device(struct hfi1_devdata *dd)
                 * We can't count on interrupts since we are stopping.
                 */
                hfi1_quiet_serdes(ppd);
-
                if (ppd->hfi1_wq)
                        flush_workqueue(ppd->hfi1_wq);
-               if (ppd->link_wq) {
+               if (ppd->link_wq)
                        flush_workqueue(ppd->link_wq);
-                       destroy_workqueue(ppd->link_wq);
-                       ppd->link_wq = NULL;
-               }
        }
        sdma_exit(dd);
 }