Re: [PATCH v3 1/2] ufs: core: fix the issue of ICU failure

[Bart Van Assche <bvanassche@xxxxxxx>]

On 9/9/24 1:20 AM, peter.wang@xxxxxxxxxxxx wrote:
> diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c
> index 5891cdacd0b3..3903947dbed1 100644
> --- a/drivers/ufs/core/ufs-mcq.c
> +++ b/drivers/ufs/core/ufs-mcq.c
> @@ -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;

Reviewed-by: Bart Van Assche <bvanassche@xxxxxxx>