On 01/12/2021 01:33, Bart Van Assche wrote:
> The only functional change in this patch is that scsi_done() is now called
> after ufshcd_release() and ufshcd_clk_scaling_update_busy() instead of
> before.
>
> The next patch in this series will introduce a call to
> ufshcd_release_scsi_cmd() in the abort handler.
>
> Signed-off-by: Bart Van Assche <bvanassche@xxxxxxx>
Reviewed-by: Adrian Hunter <adrian.hunter@xxxxxxxxx>
> ---
> drivers/scsi/ufs/ufshcd.c | 22 ++++++++++++++--------
> 1 file changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/scsi/ufs/ufshcd.c b/drivers/scsi/ufs/ufshcd.c
> index 4e9755c060af..8703e4a70256 100644
> --- a/drivers/scsi/ufs/ufshcd.c
> +++ b/drivers/scsi/ufs/ufshcd.c
> @@ -5213,6 +5213,18 @@ static irqreturn_t ufshcd_uic_cmd_compl(struct ufs_hba *hba, u32 intr_status)
> return retval;
> }
>
> +/* Release the resources allocated for processing a SCSI command. */
> +static void ufshcd_release_scsi_cmd(struct ufs_hba *hba,
> + struct ufshcd_lrb *lrbp)
> +{
> + struct scsi_cmnd *cmd = lrbp->cmd;
> +
> + scsi_dma_unmap(cmd);
> + lrbp->cmd = NULL; /* Mark the command as completed. */
> + ufshcd_release(hba);
> + ufshcd_clk_scaling_update_busy(hba);
> +}
> +
> /**
> * __ufshcd_transfer_req_compl - handle SCSI and query command completion
> * @hba: per adapter instance
> @@ -5223,7 +5235,6 @@ static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,
> {
> struct ufshcd_lrb *lrbp;
> struct scsi_cmnd *cmd;
> - int result;
> int index;
>
> for_each_set_bit(index, &completed_reqs, hba->nutrs) {
> @@ -5234,15 +5245,10 @@ static void __ufshcd_transfer_req_compl(struct ufs_hba *hba,
> if (unlikely(ufshcd_should_inform_monitor(hba, lrbp)))
> ufshcd_update_monitor(hba, lrbp);
> ufshcd_add_command_trace(hba, index, UFS_CMD_COMP);
> - result = ufshcd_transfer_rsp_status(hba, lrbp);
> - scsi_dma_unmap(cmd);
> - cmd->result = result;
> - /* Mark completed command as NULL in LRB */
> - lrbp->cmd = NULL;
> + cmd->result = ufshcd_transfer_rsp_status(hba, lrbp);
> + ufshcd_release_scsi_cmd(hba, lrbp);
> /* Do not touch lrbp after scsi done */
> scsi_done(cmd);
> - ufshcd_release(hba);
> - ufshcd_clk_scaling_update_busy(hba);
> } else if (lrbp->command_type == UTP_CMD_TYPE_DEV_MANAGE ||
> lrbp->command_type == UTP_CMD_TYPE_UFS_STORAGE) {
> if (hba->dev_cmd.complete) {
>
