scsi: mpi3mr: Improve wait logic while controller transitions to READY state

During controller transitioning to READY state, if the controller is found
in transient states ("becoming ready" or "reset requested"), driver waits
for 510 secs even if the controller transitions out of these states
early. This causes an unnecessary delay of 510 secs in the overall firmware
initialization sequence.

Poll the controller state periodically (every 100 milliseconds) while
waiting for the controller to come out of the mentioned transient
states. Once the controller transits out of the transient states, come out
of the wait loop.

Signed-off-by: Sumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: Ranjan Kumar <ranjan.kumar@broadcom.com>
Link: https://lore.kernel.org/r/20240905102753.105310-5-ranjan.kumar@broadcom.com
Signed-off-by: Martin K. Petersen <martin.petersen@oracle.com>

diff --git a/drivers/scsi/mpi3mr/mpi3mr_fw.c b/drivers/scsi/mpi3mr/mpi3mr_fw.c
index ddb770fae9d340f2db1d64f9aa88309ee4c5228f..86f7136cd5aee057cd789835e5b9611c19f910e8 100644 (file)
--- a/drivers/scsi/mpi3mr/mpi3mr_fw.c
+++ b/drivers/scsi/mpi3mr/mpi3mr_fw.c
@@ -1384,26 +1384,23 @@ static int mpi3mr_bring_ioc_ready(struct mpi3mr_ioc *mrioc)
        ioc_info(mrioc, "controller is in %s state during detection\n",
            mpi3mr_iocstate_name(ioc_state));
 
-       if (ioc_state == MRIOC_STATE_BECOMING_READY ||
-           ioc_state == MRIOC_STATE_RESET_REQUESTED) {
-               timeout = mrioc->ready_timeout * 10;
-               do {
-                       msleep(100);
-               } while (--timeout);
+       timeout = mrioc->ready_timeout * 10;
+
+       do {
+               ioc_state = mpi3mr_get_iocstate(mrioc);
+
+               if (ioc_state != MRIOC_STATE_BECOMING_READY &&
+                   ioc_state != MRIOC_STATE_RESET_REQUESTED)
+                       break;
 
                if (!pci_device_is_present(mrioc->pdev)) {
                        mrioc->unrecoverable = 1;
-                       ioc_err(mrioc,
-                           "controller is not present while waiting to reset\n");
-                       retval = -1;
+                       ioc_err(mrioc, "controller is not present while waiting to reset\n");
                        goto out_device_not_present;
                }
 
-               ioc_state = mpi3mr_get_iocstate(mrioc);
-               ioc_info(mrioc,
-                   "controller is in %s state after waiting to reset\n",
-                   mpi3mr_iocstate_name(ioc_state));
-       }
+               msleep(100);
+       } while (--timeout);
 
        if (ioc_state == MRIOC_STATE_READY) {
                ioc_info(mrioc, "issuing message unit reset (MUR) to bring to reset state\n");