3 files changed, 16 insertions, 7 deletions

diff --git a/drivers/infiniband/hw/hfi1/chip.c b/drivers/infiniband/hw/hfi1/chip.c
index 6660f920f42e..57f0df2f84f2 100644
--- a/drivers/infiniband/hw/hfi1/chip.c
+++ b/drivers/infiniband/hw/hfi1/chip.c
@@ -8264,8 +8264,8 @@ static irqreturn_t sdma_interrupt(int irq, void *data)
                 /* handle the interrupt(s) */
                 sdma_engine_interrupt(sde, status);
         } else {
-                dd_dev_err_ratelimited(dd, "SDMA engine %u interrupt, but no status bits set\n",
-                                       sde->this_idx);
+                dd_dev_info_ratelimited(dd, "SDMA engine %u interrupt, but no status bits set\n",
+                                        sde->this_idx);
         }
         return IRQ_HANDLED;
 }
@@ -12960,7 +12960,14 @@ static void disable_intx(struct pci_dev *pdev)
         pci_intx(pdev, 0);
 }
 
-static void clean_up_interrupts(struct hfi1_devdata *dd)
+/**
+ * hfi1_clean_up_interrupts() - Free all IRQ resources
+ * @dd: valid device data data structure
+ *
+ * Free the MSI or INTx IRQs and assoicated PCI resources,
+ * if they have been allocated.
+ */
+void hfi1_clean_up_interrupts(struct hfi1_devdata *dd)
 {
         int i;
 
@@ -13321,7 +13328,7 @@ static int set_up_interrupts(struct hfi1_devdata *dd)
         return 0;
 
 fail:
-        clean_up_interrupts(dd);
+        hfi1_clean_up_interrupts(dd);
         return ret;
 }
 
@@ -14748,7 +14755,6 @@ void hfi1_start_cleanup(struct hfi1_devdata *dd)
         aspm_exit(dd);
         free_cntrs(dd);
         free_rcverr(dd);
-        clean_up_interrupts(dd);
         finish_chip_resources(dd);
 }
 
@@ -15204,7 +15210,7 @@ bail_free_rcverr:
 bail_free_cntrs:
         free_cntrs(dd);
 bail_clear_intr:
-        clean_up_interrupts(dd);
+        hfi1_clean_up_interrupts(dd);
 bail_cleanup:
         hfi1_pcie_ddcleanup(dd);
 bail_free:
diff --git a/drivers/infiniband/hw/hfi1/hfi.h b/drivers/infiniband/hw/hfi1/hfi.h
index b42c22292597..5757d0e3482d 100644
--- a/drivers/infiniband/hw/hfi1/hfi.h
+++ b/drivers/infiniband/hw/hfi1/hfi.h
@@ -1957,6 +1957,7 @@ void hfi1_verbs_unregister_sysfs(struct hfi1_devdata *dd);
 int qsfp_dump(struct hfi1_pportdata *ppd, char *buf, int len);
 
 int hfi1_pcie_init(struct pci_dev *pdev, const struct pci_device_id *ent);
+void hfi1_clean_up_interrupts(struct hfi1_devdata *dd);
 void hfi1_pcie_cleanup(struct pci_dev *pdev);
 int hfi1_pcie_ddinit(struct hfi1_devdata *dd, struct pci_dev *pdev);
 void hfi1_pcie_ddcleanup(struct hfi1_devdata *);
diff --git a/drivers/infiniband/hw/hfi1/init.c b/drivers/infiniband/hw/hfi1/init.c
index 9b128268fb28..c676d1cb8755 100644
--- a/drivers/infiniband/hw/hfi1/init.c
+++ b/drivers/infiniband/hw/hfi1/init.c
@@ -1058,8 +1058,9 @@ static void shutdown_device(struct hfi1_devdata *dd)
         }
         dd->flags &= ~HFI1_INITTED;
 
-        /* mask interrupts, but not errors */
+        /* mask and clean up interrupts, but not errors */
         set_intr_state(dd, 0);
+        hfi1_clean_up_interrupts(dd);
 
         for (pidx = 0; pidx < dd->num_pports; ++pidx) {
                 ppd = dd->pport + pidx;
@@ -1704,6 +1705,7 @@ static int init_one(struct pci_dev *pdev, const struct pci_device_id *ent)
                 dd_dev_err(dd, "Failed to create /dev devices: %d\n", -j);
 
         if (initfail || ret) {
+                hfi1_clean_up_interrupts(dd);
                 stop_timers(dd);
                 flush_workqueue(ib_wq);
                 for (pidx = 0; pidx < dd->num_pports; ++pidx) {