| Message ID | 20200706060707.32608-3-stanley.chu@mediatek.com (mailing list archive) |
|---|---|
| State | Mainlined |
| Commit | 6edfdcfe285e499994b94a0f93e1f46ab2398162 |
| Headers | show |
| Series | scsi: ufs: Fix and simplify setup_xfer_req vop and request's completion timestamp | expand |
On 2020-07-06 14:07, Stanley Chu wrote: > Add missing "setup_xfer_req" call in ufshcd_issue_devman_upiu_cmd() > by ufs-bsg path, and collect all "setup_xfer_req" calls to an unified > place, i.e., ufshcd_send_command(), to simplify the driver. > > Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> Reviewed-by: Can Guo <cang@codeaurora.org> > --- > drivers/scsi/ufs/ufshcd.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c > index 71e8d7c782bd..8603b07045a6 100644 > --- 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); > @@ -2544,7 +2547,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); > @@ -2731,7 +2733,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);
diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c index 71e8d7c782bd..8603b07045a6 100644 --- 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); @@ -2544,7 +2547,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); @@ -2731,7 +2733,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);
Add missing "setup_xfer_req" call in ufshcd_issue_devman_upiu_cmd() by ufs-bsg path, and collect all "setup_xfer_req" calls to an unified place, i.e., ufshcd_send_command(), to simplify the driver. Signed-off-by: Stanley Chu <stanley.chu@mediatek.com> --- drivers/scsi/ufs/ufshcd.c | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-)