| Message ID | 20240708211716.2827751-9-bvanassche@acm.org (mailing list archive) |
|---|---|
| State | Accepted |
| Headers | show |
| Series | UFS patches for kernel 6.11 | expand |
On Mon, Jul 08, 2024 at 02:16:03PM -0700, Bart Van Assche wrote: > Move the ufshcd_mcq_enable() call from inside ufshcd_config_mcq() to the > callers of this function. No functionality is changed by this patch. This > patch makes a later patch easier to read ("scsi: ufs: Make .get_hba_mac() > optional"). > > Cc: Peter Wang <peter.wang@mediatek.com> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> Reviewed-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> - Mani > --- > drivers/ufs/core/ufshcd.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > > diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c > index 7647d8969001..4c2b60dec43f 100644 > --- a/drivers/ufs/core/ufshcd.c > +++ b/drivers/ufs/core/ufshcd.c > @@ -8703,8 +8703,6 @@ static void ufshcd_config_mcq(struct ufs_hba *hba) > ufshcd_mcq_make_queues_operational(hba); > ufshcd_mcq_config_mac(hba, hba->nutrs); > > - ufshcd_mcq_enable(hba); > - > dev_info(hba->dev, "MCQ configured, nr_queues=%d, io_queues=%d, read_queue=%d, poll_queues=%d, queue_depth=%d\n", > hba->nr_hw_queues, hba->nr_queues[HCTX_TYPE_DEFAULT], > hba->nr_queues[HCTX_TYPE_READ], hba->nr_queues[HCTX_TYPE_POLL], > @@ -8732,8 +8730,10 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > ufshcd_set_link_active(hba); > > /* Reconfigure MCQ upon reset */ > - if (hba->mcq_enabled && !init_dev_params) > + if (hba->mcq_enabled && !init_dev_params) { > ufshcd_config_mcq(hba); > + ufshcd_mcq_enable(hba); > + } > > /* Verify device initialization by sending NOP OUT UPIU */ > ret = ufshcd_verify_dev_init(hba); > @@ -8757,6 +8757,7 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > ret = ufshcd_alloc_mcq(hba); > if (!ret) { > ufshcd_config_mcq(hba); > + ufshcd_mcq_enable(hba); > } else { > /* Continue with SDB mode */ > use_mcq_mode = false; > @@ -8772,6 +8773,7 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) > } else if (is_mcq_supported(hba)) { > /* UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH is set */ > ufshcd_config_mcq(hba); > + ufshcd_mcq_enable(hba); > } > } >
On Mon, 2024-07-08 at 14:16 -0700, Bart Van Assche wrote: > > External email : Please do not click links or open attachments until > you have verified the sender or the content. > Move the ufshcd_mcq_enable() call from inside ufshcd_config_mcq() to > the > callers of this function. No functionality is changed by this patch. > This > patch makes a later patch easier to read ("scsi: ufs: Make > .get_hba_mac() > optional"). > > Cc: Peter Wang <peter.wang@mediatek.com> > Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> > Signed-off-by: Bart Van Assche <bvanassche@acm.org> > --- > drivers/ufs/core/ufshcd.c | 8 +++++--- > 1 file changed, 5 insertions(+), 3 deletions(-) > Reviewed-by: Peter Wang <peter.wang@mediatek.com>
diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c index 7647d8969001..4c2b60dec43f 100644 --- a/drivers/ufs/core/ufshcd.c +++ b/drivers/ufs/core/ufshcd.c @@ -8703,8 +8703,6 @@ static void ufshcd_config_mcq(struct ufs_hba *hba) ufshcd_mcq_make_queues_operational(hba); ufshcd_mcq_config_mac(hba, hba->nutrs); - ufshcd_mcq_enable(hba); - dev_info(hba->dev, "MCQ configured, nr_queues=%d, io_queues=%d, read_queue=%d, poll_queues=%d, queue_depth=%d\n", hba->nr_hw_queues, hba->nr_queues[HCTX_TYPE_DEFAULT], hba->nr_queues[HCTX_TYPE_READ], hba->nr_queues[HCTX_TYPE_POLL], @@ -8732,8 +8730,10 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) ufshcd_set_link_active(hba); /* Reconfigure MCQ upon reset */ - if (hba->mcq_enabled && !init_dev_params) + if (hba->mcq_enabled && !init_dev_params) { ufshcd_config_mcq(hba); + ufshcd_mcq_enable(hba); + } /* Verify device initialization by sending NOP OUT UPIU */ ret = ufshcd_verify_dev_init(hba); @@ -8757,6 +8757,7 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) ret = ufshcd_alloc_mcq(hba); if (!ret) { ufshcd_config_mcq(hba); + ufshcd_mcq_enable(hba); } else { /* Continue with SDB mode */ use_mcq_mode = false; @@ -8772,6 +8773,7 @@ static int ufshcd_device_init(struct ufs_hba *hba, bool init_dev_params) } else if (is_mcq_supported(hba)) { /* UFSHCD_QUIRK_REINIT_AFTER_MAX_GEAR_SWITCH is set */ ufshcd_config_mcq(hba); + ufshcd_mcq_enable(hba); } }
Move the ufshcd_mcq_enable() call from inside ufshcd_config_mcq() to the callers of this function. No functionality is changed by this patch. This patch makes a later patch easier to read ("scsi: ufs: Make .get_hba_mac() optional"). Cc: Peter Wang <peter.wang@mediatek.com> Cc: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org> Signed-off-by: Bart Van Assche <bvanassche@acm.org> --- drivers/ufs/core/ufshcd.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-)