]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
scsi: mpt3sas: Fix loop logic
authorRanjan Kumar <ranjan.kumar@broadcom.com>
Fri, 20 Oct 2023 10:58:49 +0000 (16:28 +0530)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 28 Nov 2023 17:14:59 +0000 (17:14 +0000)
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@vger.kernel.org
Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
Link: https://lore.kernel.org/r/20231020105849.6350-1-ranjan.kumar@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
drivers/scsi/mpt3sas/mpt3sas_base.c

index 5284584e4cd2b0d25e33ffbeb56c34508cad83e8..2fa56ef7f6594ba056f87ac44630a709601d66f1 100644 (file)
@@ -223,8 +223,8 @@ _base_readl_ext_retry(const volatile void __iomem *addr)
 
        for (i = 0 ; i < 30 ; i++) {
                ret_val = readl(addr);
-               if (ret_val == 0)
-                       continue;
+               if (ret_val != 0)
+                       break;
        }
 
        return ret_val;