| Message ID | 20240822213645.1125016-2-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Superseded |
| Headers | show |
| Series | Simplify the UFS driver initialization code | expand |
> Move the code for adding a SCSI host and also the code for managing TMF tags > from ufshcd_init() into a new function called ufshcd_add_scsi_host(). No > functionality has been changed. > > Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Avri Altman <avri.altman@wdc.com>
On Thu, Aug 22, 2024 at 02:36:02PM -0700, Bart Van Assche wrote: > Move the code for adding a SCSI host and also the code for managing > TMF tags from ufshcd_init() into a new function called > ufshcd_add_scsi_host(). No functionality has been changed. > > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > drivers/ufs/core/ufshcd.c | 84 ++++++++++++++++++++++++--------------- > 1 file changed, 53 insertions(+), 31 deletions(-) > > diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c > index 0dd26059f5d7..d29e469c3873 100644 > --- a/drivers/ufs/core/ufshcd.c > +++ b/drivers/ufs/core/ufshcd.c > @@ -10381,6 +10381,56 @@ static const struct blk_mq_ops ufshcd_tmf_ops = { > .queue_rq = ufshcd_queue_tmf, > }; > > +static int ufshcd_add_scsi_host(struct ufs_hba *hba) > +{ > + int err; > + > + if (!is_mcq_supported(hba)) { > + err = scsi_add_host(hba->host, hba->dev); > + if (err) { > + dev_err(hba->dev, "scsi_add_host failed\n"); > + return err; > + } > + hba->scsi_host_added = true; > + } > + > + hba->tmf_tag_set = (struct blk_mq_tag_set) { > + .nr_hw_queues = 1, > + .queue_depth = hba->nutmrs, > + .ops = &ufshcd_tmf_ops, > + .flags = BLK_MQ_F_NO_SCHED, > + }; > + err = blk_mq_alloc_tag_set(&hba->tmf_tag_set); > + if (err < 0) > + goto remove_scsi_host; > + hba->tmf_queue = blk_mq_alloc_queue(&hba->tmf_tag_set, NULL, NULL); > + if (IS_ERR(hba->tmf_queue)) { > + err = PTR_ERR(hba->tmf_queue); > + goto free_tmf_tag_set; > + } > + hba->tmf_rqs = devm_kcalloc(hba->dev, hba->nutmrs, > + sizeof(*hba->tmf_rqs), GFP_KERNEL); > + if (!hba->tmf_rqs) { > + err = -ENOMEM; > + goto free_tmf_queue; > + } > + > + return 0; > + > +free_tmf_queue: > + blk_mq_destroy_queue(hba->tmf_queue); > + blk_put_queue(hba->tmf_queue); > + > +free_tmf_tag_set: > + blk_mq_free_tag_set(&hba->tmf_tag_set); > + > +remove_scsi_host: > + if (hba->scsi_host_added) > + scsi_remove_host(hba->host); > + > + return err; > +} > + > /** > * ufshcd_init - Driver initialization routine > * @hba: per-adapter instance > @@ -10514,35 +10564,9 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) > hba->is_irq_enabled = true; > } > > - if (!is_mcq_supported(hba)) { I guess this series is based on v6.11-rc1, because starting from -rc2 we have lsdb check here. - Mani > - err = scsi_add_host(host, hba->dev); > - if (err) { > - dev_err(hba->dev, "scsi_add_host failed\n"); > - goto out_disable; > - } > - hba->scsi_host_added = true; > - } > - > - hba->tmf_tag_set = (struct blk_mq_tag_set) { > - .nr_hw_queues = 1, > - .queue_depth = hba->nutmrs, > - .ops = &ufshcd_tmf_ops, > - .flags = BLK_MQ_F_NO_SCHED, > - }; > - err = blk_mq_alloc_tag_set(&hba->tmf_tag_set); > - if (err < 0) > - goto out_remove_scsi_host; > - hba->tmf_queue = blk_mq_alloc_queue(&hba->tmf_tag_set, NULL, NULL); > - if (IS_ERR(hba->tmf_queue)) { > - err = PTR_ERR(hba->tmf_queue); > - goto free_tmf_tag_set; > - } > - hba->tmf_rqs = devm_kcalloc(hba->dev, hba->nutmrs, > - sizeof(*hba->tmf_rqs), GFP_KERNEL); > - if (!hba->tmf_rqs) { > - err = -ENOMEM; > - goto free_tmf_queue; > - } > + err = ufshcd_add_scsi_host(hba); > + if (err) > + goto out_disable; > > /* Reset the attached device */ > ufshcd_device_reset(hba); > @@ -10600,9 +10624,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) > free_tmf_queue: > blk_mq_destroy_queue(hba->tmf_queue); > blk_put_queue(hba->tmf_queue); > -free_tmf_tag_set: > blk_mq_free_tag_set(&hba->tmf_tag_set); > -out_remove_scsi_host: > if (hba->scsi_host_added) > scsi_remove_host(hba->host); > out_disable:
On 8/25/24 1:10 AM, Manivannan Sadhasivam wrote: > On Thu, Aug 22, 2024 at 02:36:02PM -0700, Bart Van Assche wrote: >> /** >> * ufshcd_init - Driver initialization routine >> * @hba: per-adapter instance >> @@ -10514,35 +10564,9 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) >> hba->is_irq_enabled = true; >> } >> >> - if (!is_mcq_supported(hba)) { > > I guess this series is based on v6.11-rc1, because starting from -rc2 we have > lsdb check here. Hi Manivannan, My patch series is based on Martin's for-next branch. The UFSHCD_QUIRK_BROKEN_LSDBS_CAP support has been queued on Martin's fixes branch. I think this is why the lsdb check is not visible above. I will analyze whether it is possible to rework this patch series such that Linus won't have to solve a complicated merge conflict during the next merge window. Thanks, Bart.
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 0dd26059f5d7..d29e469c3873 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -10381,6 +10381,56 @@ static const struct blk_mq_ops ufshcd_tmf_ops = { .queue_rq = ufshcd_queue_tmf, }; +static int ufshcd_add_scsi_host(struct ufs_hba *hba) +{ + int err; + + if (!is_mcq_supported(hba)) { + err = scsi_add_host(hba->host, hba->dev); + if (err) { + dev_err(hba->dev, "scsi_add_host failed\n"); + return err; + } + hba->scsi_host_added = true; + } + + hba->tmf_tag_set = (struct blk_mq_tag_set) { + .nr_hw_queues = 1, + .queue_depth = hba->nutmrs, + .ops = &ufshcd_tmf_ops, + .flags = BLK_MQ_F_NO_SCHED, + }; + err = blk_mq_alloc_tag_set(&hba->tmf_tag_set); + if (err < 0) + goto remove_scsi_host; + hba->tmf_queue = blk_mq_alloc_queue(&hba->tmf_tag_set, NULL, NULL); + if (IS_ERR(hba->tmf_queue)) { + err = PTR_ERR(hba->tmf_queue); + goto free_tmf_tag_set; + } + hba->tmf_rqs = devm_kcalloc(hba->dev, hba->nutmrs, + sizeof(*hba->tmf_rqs), GFP_KERNEL); + if (!hba->tmf_rqs) { + err = -ENOMEM; + goto free_tmf_queue; + } + + return 0; + +free_tmf_queue: + blk_mq_destroy_queue(hba->tmf_queue); + blk_put_queue(hba->tmf_queue); + +free_tmf_tag_set: + blk_mq_free_tag_set(&hba->tmf_tag_set); + +remove_scsi_host: + if (hba->scsi_host_added) + scsi_remove_host(hba->host); + + return err; +} + /** * ufshcd_init - Driver initialization routine * @hba: per-adapter instance @@ -10514,35 +10564,9 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) hba->is_irq_enabled = true; } - if (!is_mcq_supported(hba)) { - err = scsi_add_host(host, hba->dev); - if (err) { - dev_err(hba->dev, "scsi_add_host failed\n"); - goto out_disable; - } - hba->scsi_host_added = true; - } - - hba->tmf_tag_set = (struct blk_mq_tag_set) { - .nr_hw_queues = 1, - .queue_depth = hba->nutmrs, - .ops = &ufshcd_tmf_ops, - .flags = BLK_MQ_F_NO_SCHED, - }; - err = blk_mq_alloc_tag_set(&hba->tmf_tag_set); - if (err < 0) - goto out_remove_scsi_host; - hba->tmf_queue = blk_mq_alloc_queue(&hba->tmf_tag_set, NULL, NULL); - if (IS_ERR(hba->tmf_queue)) { - err = PTR_ERR(hba->tmf_queue); - goto free_tmf_tag_set; - } - hba->tmf_rqs = devm_kcalloc(hba->dev, hba->nutmrs, - sizeof(*hba->tmf_rqs), GFP_KERNEL); - if (!hba->tmf_rqs) { - err = -ENOMEM; - goto free_tmf_queue; - } + err = ufshcd_add_scsi_host(hba); + if (err) + goto out_disable; /* Reset the attached device */ ufshcd_device_reset(hba); @@ -10600,9 +10624,7 @@ int ufshcd_init(struct ufs_hba *hba, void __iomem *mmio_base, unsigned int irq) free_tmf_queue: blk_mq_destroy_queue(hba->tmf_queue); blk_put_queue(hba->tmf_queue); -free_tmf_tag_set: blk_mq_free_tag_set(&hba->tmf_tag_set); -out_remove_scsi_host: if (hba->scsi_host_added) scsi_remove_host(hba->host); out_disable:
Move the code for adding a SCSI host and also the code for managing TMF tags from ufshcd_init() into a new function called ufshcd_add_scsi_host(). No functionality has been changed. Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/ufs/core/ufshcd.c | 84 ++++++++++++++++++++++++--------------- 1 file changed, 53 insertions(+), 31 deletions(-)