This is a note to let you know that I've just added the patch titled
scsi: mpt3sas: Fix loop logic
to the 6.1-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
scsi-mpt3sas-fix-loop-logic.patch
and it can be found in the queue-6.1 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree,
please let <stable@xxxxxxxxxxxxxxx> know about it.
>From 3c978492c333f0c08248a8d51cecbe5eb5f617c9 Mon Sep 17 00:00:00 2001
From: Ranjan Kumar <ranjan.kumar@xxxxxxxxxxxx>
Date: Fri, 20 Oct 2023 16:28:49 +0530
Subject: scsi: mpt3sas: Fix loop logic
From: Ranjan Kumar <ranjan.kumar@xxxxxxxxxxxx>
commit 3c978492c333f0c08248a8d51cecbe5eb5f617c9 upstream.
The retry loop continues to iterate until the count reaches 30, even after
receiving the correct value. Exit loop when a non-zero value is read.
Fixes: 4ca10f3e3174 ("scsi: mpt3sas: Perform additional retries if doorbell read returns 0")
Cc: stable@xxxxxxxxxxxxxxx
Signed-off-by: Ranjan Kumar <ranjan.kumar@xxxxxxxxxxxx>
Link: https://lore.kernel.org/r/20231020105849.6350-1-ranjan.kumar@xxxxxxxxxxxx
Signed-off-by: Martin K. Petersen <martin.petersen@xxxxxxxxxx>
Signed-off-by: Greg Kroah-Hartman <gregkh@xxxxxxxxxxxxxxxxxxx>
---
drivers/scsi/mpt3sas/mpt3sas_base.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
--- a/drivers/scsi/mpt3sas/mpt3sas_base.c
+++ b/drivers/scsi/mpt3sas/mpt3sas_base.c
@@ -224,8 +224,8 @@ _base_readl_ext_retry(const volatile voi
for (i = 0 ; i < 30 ; i++) {
ret_val = readl(addr);
- if (ret_val == 0)
- continue;
+ if (ret_val != 0)
+ break;
}
return ret_val;
Patches currently in stable-queue which might be from ranjan.kumar@xxxxxxxxxxxx are
queue-6.1/scsi-megaraid_sas-increase-register-read-retry-rount-from-3-to-30-for-selected-registers.patch
queue-6.1/scsi-mpt3sas-fix-loop-logic.patch
