From: Martin K. Petersen Date: Thu, 7 Nov 2024 01:37:45 +0000 (-0500) Subject: Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging X-Git-Url: https://www.infradead.org/git/?a=commitdiff_plain;h=4b3b5815bcf3312539be569c2ffe702aa1f42153;p=users%2Fjedix%2Flinux-maple.git Merge branch '6.12/scsi-fixes' into 6.13/scsi-staging Pull in 6.12 fixes branch to resolve a merge conflict in ufs-mcq.c. Signed-off-by: Martin K. Petersen --- 4b3b5815bcf3312539be569c2ffe702aa1f42153 diff --cc drivers/ufs/core/ufs-mcq.c index 9884005005605,3903947dbed1c..24c10e62cef9f --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@@ -569,10 -569,11 +569,11 @@@ int ufshcd_mcq_sq_cleanup(struct ufs_hb 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 */ + /* Wait until SQRTSy.CUS = 1. Report SQRTSy.RTC. */ reg = opr_sqd_base + REG_SQRTS; err = read_poll_timeout(readl, val, val & SQ_CUS, 20, MCQ_POLL_US, false, reg);