From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from smtp.kernel.org (aws-us-west-2-korg-mail-1.web.codeaurora.org [10.30.226.201]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 11C5F1F1312; Mon, 21 Oct 2024 10:37:05 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=10.30.226.201 ARC-Seal:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729507026; cv=none; b=j3YjDYOI5+fvvU00KLnbO3VNYgr4kR1EcCjD8SG62jtzqWD6NONMKJI7H6cGUGImfnnRk85aIbflMof9719DzfT8OvCCrDCOoxU/VFnDf8gJI2f2yCwiWOuHxv6yVGUVh67WWD1Q7LDD58cCCgf9LzWprrJfQCollYazKezN0YI= ARC-Message-Signature:i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1729507026; c=relaxed/simple; bh=z6u1soZ3+2/AkqBHuhNuR81etlkm8pMi7GeAKI7GyZA=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=DLpq8Qo7xNWaOMfZ3mHFKDIeQF4ztw5MB9T4Xq1qt5rFTJd+6DeWercERHyQUHwci0KIOqEzHk6YxBzCgdV3yPHItQhOVT/bPr10I/oU0c/Sak48xVHLnhbdM50HxT67kpOpGzkWFilTcR/iXsouhcnuynxmHAZhZcqf2p7YeiE= ARC-Authentication-Results:i=1; smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b=MriEkoV+; arc=none smtp.client-ip=10.30.226.201 Authentication-Results: smtp.subspace.kernel.org; dkim=pass (1024-bit key) header.d=linuxfoundation.org header.i=@linuxfoundation.org header.b="MriEkoV+" Received: by smtp.kernel.org (Postfix) with ESMTPSA id 4791CC4CEC3; Mon, 21 Oct 2024 10:37:05 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1729507025; bh=z6u1soZ3+2/AkqBHuhNuR81etlkm8pMi7GeAKI7GyZA=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=MriEkoV+1EVSfsHyA7cw//9KN2qA7dhBJAE8tQG8wRCWqBNVlFtZOAByPRx5Ei+qL og2aF+Q5UxuNkFkATOCONUlwtpWr9eeWwHLEseSqEt4g0nLDr5OWnUP+zlEuDd39Kv lLi45INQOZe3kbr+L6pA6bSnNgXR5k3J7SyzI1iI= From: Greg Kroah-Hartman To: stable@vger.kernel.org Cc: Greg Kroah-Hartman , patches@lists.linux.dev, Peter Wang , "Bao D. Nguyen" , Bart Van Assche , "Martin K. Petersen" Subject: [PATCH 6.6 065/124] scsi: ufs: core: Fix the issue of ICU failure Date: Mon, 21 Oct 2024 12:24:29 +0200 Message-ID: <20241021102259.248275552@linuxfoundation.org> X-Mailer: git-send-email 2.47.0 In-Reply-To: <20241021102256.706334758@linuxfoundation.org> References: <20241021102256.706334758@linuxfoundation.org> User-Agent: quilt/0.67 X-stable: review X-Patchwork-Hint: ignore Precedence: bulk X-Mailing-List: stable@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: 8bit 6.6-stable review patch. If anyone has any objections, please let me know. ------------------ From: Peter Wang commit bf0c6cc73f7f91ec70307f7c72343f6cb7d65d01 upstream. 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: ab248643d3d6 ("scsi: ufs: core: Add error handling for MCQ mode") Cc: stable@vger.kernel.org Signed-off-by: Peter Wang Link: https://lore.kernel.org/r/20241001091917.6917-2-peter.wang@mediatek.com Reviewed-by: Bao D. Nguyen Reviewed-by: Bart Van Assche Signed-off-by: Martin K. Petersen Signed-off-by: Greg Kroah-Hartman --- drivers/ufs/core/ufs-mcq.c | 15 ++++++++------- 1 file changed, 8 insertions(+), 7 deletions(-) --- a/drivers/ufs/core/ufs-mcq.c +++ b/drivers/ufs/core/ufs-mcq.c @@ -498,7 +498,7 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba 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) @@ -528,17 +528,18 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba 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;