Commit bf0c6cc7 authored by Peter Wang's avatar Peter Wang Committed by Martin K. Petersen
Browse files

scsi: ufs: core: Fix the issue of ICU failure 



When setting the ICU bit without using read-modify-write, SQRTCy will
restart SQ again and receive an RTC return error code 2 (Failure - SQ
not stopped).

Additionally, the error log has been modified so that this type of error
can be observed.

Fixes: ab248643 ("scsi: ufs: core: Add error handling for MCQ mode")
Cc: stable@vger.kernel.org
Signed-off-by: default avatarPeter Wang <peter.wang@mediatek.com>
Link: https://lore.kernel.org/r/20241001091917.6917-2-peter.wang@mediatek.com


Reviewed-by: default avatarBao D. Nguyen <quic_nguyenb@quicinc.com>
Reviewed-by: default avatarBart Van Assche <bvanassche@acm.org>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent d539a871

drivers/ufs/core/ufs-mcq.c

+8 −7
Original line number Diff line number Diff line
@@ -539,7 +539,7 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag) 
	struct scsi_cmnd *cmd = lrbp->cmd;

	struct ufs_hw_queue *hwq;

	void __iomem *reg, *opr_sqd_base;

	u32 nexus, id, val;

	u32 nexus, id, val, rtc;

	int err;



	if (hba->quirks & UFSHCD_QUIRK_MCQ_BROKEN_RTC)
@@ -569,17 +569,18 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, int task_tag) 
	opr_sqd_base = mcq_opr_base(hba, OPR_SQD, id);

	writel(nexus, opr_sqd_base + REG_SQCTI);



	/* SQRTCy.ICU = 1 */

	writel(SQ_ICU, opr_sqd_base + REG_SQRTC);

	/* Initiate Cleanup */

	writel(readl(opr_sqd_base + REG_SQRTC) | SQ_ICU,

		opr_sqd_base + REG_SQRTC);



	/* Poll SQRTSy.CUS = 1. Return result from SQRTSy.RTC */

	reg = opr_sqd_base + REG_SQRTS;

	err = read_poll_timeout(readl, val, val & SQ_CUS, 20,

				MCQ_POLL_US, false, reg);

	if (err)

		dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%ld\n",

			__func__, id, task_tag,

			FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg)));

	rtc = FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg));

	if (err || rtc)

		dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%d RTC=%d\n",

			__func__, id, task_tag, err, rtc);



	if (ufshcd_mcq_sq_start(hba, hwq))

		err = -ETIMEDOUT;