scsi: ufs: Fix and simplify setup_xfer_req variant operation

commit 6edfdcfe285e499994b94a0f93e1f46ab2398162 upstream.

Add missing setup_xfer_req() call in ufshcd_issue_devman_upiu_cmd() in
ufs-bsg path. Relocate existing setup_xfer_req() calls to a common place,
i.e., ufshcd_send_command(), to simplify the driver.

Link: https://lore.kernel.org/r/20200706060707.32608-3-stanley.chu@mediatek.com
Acked-by: Avri Altman <Avri.Altman@wdc.com>
Signed-off-by: Stanley Chu <stanley.chu@mediatek.com>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
index ad4fc829cbb2fc02dae7c248312fa6714252911a..a483c0720a0c1615e1259fad80593db85b55e277 100644 (file)
--- a/drivers/scsi/ufs/ufshcd.c
+++ b/drivers/scsi/ufs/ufshcd.c
@@ -1925,8 +1925,11 @@ static void ufshcd_clk_scaling_update_busy(struct ufs_hba *hba)
 static inline
 void ufshcd_send_command(struct ufs_hba *hba, unsigned int task_tag)
 {
-       hba->lrb[task_tag].issue_time_stamp = ktime_get();
-       hba->lrb[task_tag].compl_time_stamp = ktime_set(0, 0);
+       struct ufshcd_lrb *lrbp = &hba->lrb[task_tag];
+
+       lrbp->issue_time_stamp = ktime_get();
+       lrbp->compl_time_stamp = ktime_set(0, 0);
+       ufshcd_vops_setup_xfer_req(hba, task_tag, (lrbp->cmd ? true : false));
        ufshcd_add_command_trace(hba, task_tag, "send");
        ufshcd_clk_scaling_start_busy(hba);
        __set_bit(task_tag, &hba->outstanding_reqs);
@@ -2536,7 +2539,6 @@ static int ufshcd_queuecommand(struct Scsi_Host *host, struct scsi_cmnd *cmd)
 
        /* issue command to the controller */
        spin_lock_irqsave(hba->host->host_lock, flags);
-       ufshcd_vops_setup_xfer_req(hba, tag, true);
        ufshcd_send_command(hba, tag);
 out_unlock:
        spin_unlock_irqrestore(hba->host->host_lock, flags);
@@ -2723,7 +2725,6 @@ static int ufshcd_exec_dev_cmd(struct ufs_hba *hba,
        /* Make sure descriptors are ready before ringing the doorbell */
        wmb();
        spin_lock_irqsave(hba->host->host_lock, flags);
-       ufshcd_vops_setup_xfer_req(hba, tag, false);
        ufshcd_send_command(hba, tag);
        spin_unlock_irqrestore(hba->host->host_lock, flags);