scsi: ufs: core: Call ufshcd_add_scsi_host() later

Call ufshcd_add_scsi_host() after host controller initialization has
completed. This is safe because no code between the old and new
ufshcd_add_scsi_host() call site depends on the scsi_add_host() call.

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Reviewed-by: Bean Huo <beanhuo@micron.com>
Reviewed-by: Bao D. Nguyen <quic_nguyenb@quicinc.com>
Signed-off-by: Bart Van Assche <bvanassche@acm.org>
Link: https://lore.kernel.org/r/20241016201249.2256266-4-bvanassche@acm.org
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 72f0413..4fe2339 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -10528,10 +10528,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
                hba->is_irq_enabled = true;
        }
 
-       err = ufshcd_add_scsi_host(hba);
-       if (err)
-               goto out_disable;
-
        /* Reset the attached device */
        ufshcd_device_reset(hba);
 
@@ -10543,7 +10539,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
                dev_err(hba->dev, "Host controller enable failed\n");
                ufshcd_print_evt_hist(hba);
                ufshcd_print_host_state(hba);
-               goto free_tmf_queue;
+               goto out_disable;
        }
 
        /*
@@ -10578,6 +10574,10 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
         */
        ufshcd_set_ufs_dev_active(hba);
 
+       err = ufshcd_add_scsi_host(hba);
+       if (err)
+               goto out_disable;
+
        async_schedule(ufshcd_async_scan, hba);
        ufs_sysfs_add_nodes(hba->dev);
 
@@ -10585,12 +10585,6 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq)
        ufshcd_pm_qos_init(hba);
        return 0;
 
-free_tmf_queue:
-       blk_mq_destroy_queue(hba->tmf_queue);
-       blk_put_queue(hba->tmf_queue);
-       blk_mq_free_tag_set(&hba->tmf_tag_set);
-       if (hba->scsi_host_added)
-               scsi_remove_host(hba->host);
 out_disable:
        hba->is_irq_enabled = false;
        ufshcd_hba_exit(hba);