Skip to contentSkip to conversation

ufs: core: clear cmd if abort success in mcq mode

PATCH Applied [email protected] 3 participants 3 messages Nov 15, 2023 – Nov 25, 2023

Subsystems (4)
Stable branch SCSI Arm MediaTek UFS host controller
lore
Share & tools
lore

[email protected]

author
#0 lore raw

PATCH v2 1/1 ufs: core: clear cmd if abort success in mcq mode

From: Peter Wang <[email protected]>

In mcq mode, if cmd is pending in device and abort success, response will not return from device. So we need clear this cmd right now, else command timeout happen and next time use same tag will have warning. WARN_ON(lrbp->cmd).

Below is error log:

<3>[ 2277.447611][T21376] ufshcd-mtk 112b0000.ufshci: ufshcd_try_to_abort_task: cmd pending in the device. tag = 7
<3>[ 2277.476954][T21376] ufshcd-mtk 112b0000.ufshci: Aborting tag 7 / CDB 0x2a succeeded
<6>[ 2307.551263][T30974] ufshcd-mtk 112b0000.ufshci: ufshcd_abort: Device abort task at tag 7
<4>[ 2307.623264][  T327] WARNING: CPU: 5 PID: 327 at source/drivers/ufs/core/ufshcd.c:3021 ufshcd_queuecommand+0x66c/0xe34
Fixes ab248643d3d6 ("scsi: ufs: core: Add error handling for MCQ mode")
Cc [email protected]
Signed-off-by Peter Wang <[email protected]>
---
 drivers/ufs/core/ufshcd.c | 13 +++++++++++++
 1 file changed, 13 insertions(+)
drivers/ufs/core/ufshcd.c +13 -0
index 8b1031fb0a44..6aa6f79d7841 100644
@@ -6444,11 +6444,24 @@ static bool ufshcd_abort_one(struct request *rq, void *priv)
 	struct scsi_device *sdev = cmd->device;
 	struct Scsi_Host *shost = sdev->host;
 	struct ufs_hba *hba = shost_priv(shost);
+	struct ufshcd_lrb *lrbp = &hba->lrb[tag];
+	struct ufs_hw_queue *hwq;
+	unsigned long flags;
 
 	*ret = ufshcd_try_to_abort_task(hba, tag);
 	dev_err(hba->dev, "Aborting tag %d / CDB %#02x %s\n", tag,
 		hba->lrb[tag].cmd ? hba->lrb[tag].cmd->cmnd[0] : -1,
 		*ret ? "failed" : "succeeded");
+
+	/* Release cmd in mcq mode if abort success */
+	if (is_mcq_enabled(hba) && (*ret == 0)) {
+		hwq = ufshcd_mcq_req_to_hwq(hba, scsi_cmd_to_rq(lrbp->cmd));
+		spin_lock_irqsave(&hwq->cq_lock, flags);
+		if (ufshcd_cmd_inflight(lrbp->cmd))
+			ufshcd_release_scsi_cmd(hba, lrbp);
+		spin_unlock_irqrestore(&hwq->cq_lock, flags);
+	}
+
 	return *ret == 0;
 }
Signature · 1 line
2.18.0
reviewer Reviewed-by on v2 1/1
#1 lore raw
Quoted 4 lines · On 11/15/23 05:10, [email protected] wrote:

In mcq mode, if cmd is pending in device and abort success, response will not return from device. So we need clear this cmd right now, else command timeout happen and next time use same tag will have warning. WARN_ON(lrbp->cmd).

Reviewed-by Bart Van Assche <[email protected]>
Applied
#2 lore raw
In reply to [email protected]
Quoted 5 lines · On Wed, 15 Nov 2023 21:10:24 +0800, [email protected] wrote:

In mcq mode, if cmd is pending in device and abort success, response will not return from device. So we need clear this cmd right now, else command timeout happen and next time use same tag will have warning. WARN_ON(lrbp->cmd).

Quoted 7 lines

Below is error log:

<3>[ 2277.447611][T21376] ufshcd-mtk 112b0000.ufshci: ufshcd_try_to_abort_task: cmd pending in the device. tag = 7
<3>[ 2277.476954][T21376] ufshcd-mtk 112b0000.ufshci: Aborting tag 7 / CDB 0x2a succeeded
<6>[ 2307.551263][T30974] ufshcd-mtk 112b0000.ufshci: ufshcd_abort: Device abort task at tag 7
<4>[ 2307.623264][  T327] WARNING: CPU: 5 PID: 327 at source/drivers/ufs/core/ufshcd.c:3021 ufshcd_queuecommand+0x66c/0xe34

[...]

Applied to 6.7/scsi-fixes, thanks!

[1/1] ufs: core: clear cmd if abort success in mcq mode

      https://git.kernel.org/mkp/scsi/c/93e6c0e19d5b
Signature · 1 line
Martin K. Petersen	Oracle Linux Engineering