scsi: mpi3mr: Modify MUR timeout value to 120 seconds

Modify Message Unit Reset timeout value to 120 seconds from the previous
value of 30 seconds.

Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
Signed-off-by: Sreekant Reddy <sreekanth.reddy@broadcom.com>
Link: https://lore.kernel.org/r/20230316110209.60145-4-ranjan.kumar@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpi3mr/mpi3mr.h b/drivers/scsi/mpi3mr/mpi3mr.h
index 4cb00bdb003961b63cb88c2b46828c8cc7da2ad0..eb9a447986eb79526603ca6b28d4e7fc28097e4b 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr.h
+++ b/drivers/scsi/mpi3mr/mpi3mr.h
@@ -126,6 +126,7 @@ extern atomic64_t event_counter;
 #define        MPI3MR_RAID_ERRREC_RESET_TIMEOUT        180
 #define MPI3MR_PREPARE_FOR_RESET_TIMEOUT       180
 #define MPI3MR_RESET_ACK_TIMEOUT               30
+#define MPI3MR_MUR_TIMEOUT                     120
 
 #define MPI3MR_WATCHDOG_INTERVAL               1000 /* in milli seconds */
 

diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index 25ac3bc597f536d26c1070cd7e31fb9f7a308830..037134f8b024938db67c7598ff0e71d888ae8dae 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -1092,7 +1092,7 @@ static int mpi3mr_issue_and_process_mur(struct mpi3mr_ioc *mrioc,
        ioc_config &= ~MPI3_SYSIF_IOC_CONFIG_ENABLE_IOC;
        writel(ioc_config, &mrioc->sysif_regs->ioc_configuration);
 
-       timeout = MPI3MR_RESET_ACK_TIMEOUT * 10;
+       timeout = MPI3MR_MUR_TIMEOUT * 10;
        do {
                ioc_status = readl(&mrioc->sysif_regs->ioc_status);
                if ((ioc_status & MPI3_SYSIF_IOC_STATUS_RESET_HISTORY)) {