Re: [PATCH v2 4/9] ufs: core: Call ufshcd_add_scsi_host() later

Manivannan Sadhasivam
2024-08-25T05:18:27Z

On Thu, Aug 22, 2024 at 02:36:05PM -0700, Bart Van Assche wrote:
> Call ufshcd_add_scsi_host() after host controller initialization has
> completed. This is possible because no code between the old and new
> ufshcd_add_scsi_host() call site depends on the scsi_add_host() call.
>
> Signed-off-by: Bart Van Assche <bvanassche@acm.org>

Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>

- Mani

> ---
> drivers/ufs/core/ufshcd.c | 16 +++++-----------
> 1 file changed, 5 insertions(+), 11 deletions(-)
>
> diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
> index dcc417d7e19c..b513ef46d848 100644
> --- a/drivers/ufs/core/ufshcd.c
> +++ b/drivers/ufs/core/ufshcd.c
> @@ -10585,10 +10585,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);
>
> @@ -10600,7 +10596,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;
> }
>
> /*
> @@ -10635,6 +10631,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);
>
> @@ -10642,12 +10642,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);

--
மணிவண்ணன் சதாசிவம்