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

[ Upstream commit 2a26a11e9c258b14be6fd98f8a85f20ac1fff66e ]

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 <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20240328111244.3599-1-peter.wang@mediatek.com
Reviewed-by: Bart Van Assche <bvanassche@acm.org>
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/ufs/core/ufshcd.c b/drivers/ufs/core/ufshcd.c
index 14a6a100fcdb016d82a5e9b7fb558fad459b9cb7..4a07a18cf835d3eaae0d53b11c8cc0aed3e72344 100644 (file)
--- a/drivers/ufs/core/ufshcd.c
+++ b/drivers/ufs/core/ufshcd.c
@@ -3172,7 +3172,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;
                }