scsi: hisi_sas: Fix up probe error handling for v3 hw

BugLink: https://bugs.launchpad.net/bugs/1910111
[ Upstream commit 2ebde94f2ea4cffd812ece2f318c2f4922239b1d ]

Fix some rollbacks in function hisi_sas_v3_probe() and
interrupt_init_v3_hw().

Link: https://lore.kernel.org/r/1606207594-196362-3-git-send-email-john.garry@huawei.com
Fixes: 8d98416a55eb ("scsi: hisi_sas: Switch v3 hw to MQ")
Signed-off-by: Xiang Chen <chenxiang66@hisilicon.com>
Signed-off-by: John Garry <john.garry@huawei.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>

diff --git a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
index 960de375ce699db379abb4c42df55384fd460830..2cbd8a524edabceec5037db9b17567acdf3c05c1 100644 (file)
--- a/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
+++ b/drivers/scsi/hisi_sas/hisi_sas_v3_hw.c
@@ -2409,8 +2409,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
                              DRV_NAME " phy", hisi_hba);
        if (rc) {
                dev_err(dev, "could not request phy interrupt, rc=%d\n", rc);
-               rc = -ENOENT;
-               goto free_irq_vectors;
+               return -ENOENT;
        }
 
        rc = devm_request_irq(dev, pci_irq_vector(pdev, 2),
@@ -2418,8 +2417,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
                              DRV_NAME " channel", hisi_hba);
        if (rc) {
                dev_err(dev, "could not request chnl interrupt, rc=%d\n", rc);
-               rc = -ENOENT;
-               goto free_irq_vectors;
+               return -ENOENT;
        }
 
        rc = devm_request_irq(dev, pci_irq_vector(pdev, 11),
@@ -2427,8 +2425,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
                              DRV_NAME " fatal", hisi_hba);
        if (rc) {
                dev_err(dev, "could not request fatal interrupt, rc=%d\n", rc);
-               rc = -ENOENT;
-               goto free_irq_vectors;
+               return -ENOENT;
        }
 
        if (hisi_sas_intr_conv)
@@ -2449,8 +2446,7 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
                if (rc) {
                        dev_err(dev, "could not request cq%d interrupt, rc=%d\n",
                                i, rc);
-                       rc = -ENOENT;
-                       goto free_irq_vectors;
+                       return -ENOENT;
                }
                cq->irq_mask = pci_irq_get_affinity(pdev, i + BASE_VECTORS_V3_HW);
                if (!cq->irq_mask) {
@@ -2460,10 +2456,6 @@ static int interrupt_init_v3_hw(struct hisi_hba *hisi_hba)
        }
 
        return 0;
-
-free_irq_vectors:
-       pci_free_irq_vectors(pdev);
-       return rc;
 }
 
 static int hisi_sas_v3_init(struct hisi_hba *hisi_hba)
@@ -3317,11 +3309,11 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
        rc = interrupt_preinit_v3_hw(hisi_hba);
        if (rc)
-               goto err_out_ha;
+               goto err_out_debugfs;
        dev_err(dev, "%d hw queues\n", shost->nr_hw_queues);
        rc = scsi_add_host(shost, dev);
        if (rc)
-               goto err_out_ha;
+               goto err_out_free_irq_vectors;
 
        rc = sas_register_ha(sha);
        if (rc)
@@ -3348,8 +3340,12 @@ hisi_sas_v3_probe(struct pci_dev *pdev, const struct pci_device_id *id)
 
 err_out_register_ha:
        scsi_remove_host(shost);
-err_out_ha:
+err_out_free_irq_vectors:
+       pci_free_irq_vectors(pdev);
+err_out_debugfs:
        hisi_sas_debugfs_exit(hisi_hba);
+err_out_ha:
+       hisi_sas_free(hisi_hba);
        scsi_host_put(shost);
 err_out_regions:
        pci_release_regions(pdev);