scsi: ufs: core: Fix MCQ mode dev command timeout

When a dev command times out in MCQ mode, a successfully cleared command
should cause a retry. However, because we currently return 0, the caller
considers the command a success which causes the following error to be
logged: "Invalid offset 0x0 in descriptor IDN 0x9, length 0x0".

Retry if clearing the command was successful.

Signed-off-by: Peter Wang <[email protected]>
Link: https://lore.kernel.org/r/[email protected]
Reviewed-by: Bart Van Assche <[email protected]>
Signed-off-by: Martin K. Petersen <[email protected]>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 292b06f361a26d27801f836df23ef7c4d233fdb6..a0f8e930167d70aab48b315076fe76f9924e34b4 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -3217,7 +3217,9 @@ retry:
 
                /* MCQ mode */
                if (is_mcq_enabled(hba)) {
-                       err = ufshcd_clear_cmd(hba, lrbp->task_tag);
+                       /* successfully cleared the command, retry if needed */
+                       if (ufshcd_clear_cmd(hba, lrbp->task_tag) == 0)
+                               err = -EAGAIN;
                        hba->dev_cmd.complete = NULL;
                        return err;
                }