| Message ID | 20240902021805.1125-1-peter.wang@mediatek.com |
|---|---|
| Headers | show |
| Series | fix MCQ abort defect | expand |
On Mon, 2024-09-02 at 10:18 +0800, peter.wang@mediatek.com wrote: > From: Peter Wang <peter.wang@mediatek.com> > > 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 <peter.wang@mediatek.com> > --- > drivers/ufs/core/ufs-mcq.c | 9 +++++---- > 1 file changed, 5 insertions(+), 4 deletions(-) > > diff --git a/drivers/ufs/core/ufs-mcq.c b/drivers/ufs/core/ufs-mcq.c > index 5891cdacd0b3..afd9541f4bd8 100644 > --- a/drivers/ufs/core/ufs-mcq.c > +++ b/drivers/ufs/core/ufs-mcq.c > @@ -570,15 +570,16 @@ int ufshcd_mcq_sq_cleanup(struct ufs_hba *hba, > int task_tag) > writel(nexus, opr_sqd_base + REG_SQCTI); > > /* SQRTCy.ICU = 1 */ > - writel(SQ_ICU, opr_sqd_base + REG_SQRTC); > + writel(readl(opr_sqd_base + REG_SQRTC) | SQ_ICU, > + opr_sqd_base + REG_SQRTC); > Hi Bao, Could you help review this patch series? It is a trivial MCQ spec violate bug fixed. Thanks. Peter > > /* 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, > + if (err || FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg))) > + dev_err(hba->dev, "%s: failed. hwq=%d, tag=%d err=%d > RTC=%ld\n", > + __func__, id, task_tag, err, > FIELD_GET(SQ_ICU_ERR_CODE_MASK, readl(reg))); > > if (ufshcd_mcq_sq_start(hba, hwq))
From: Peter Wang <peter.wang@mediatek.com> This series fixes MCQ abort defect. V2: - Fix mcq_enabled build error. Peter Wang (2): ufs: core: fix the issue of ICU failure ufs: core: requeue MCQ abort request drivers/ufs/core/ufs-mcq.c | 10 ++++++---- drivers/ufs/core/ufshcd.c | 21 ++++++++------------- include/ufs/ufshcd.h | 2 ++ 3 files changed, 16 insertions(+), 17 deletions(-)