Commit 4616a4b3 authored by Ranjan Kumar's avatar Ranjan Kumar Committed by Martin K. Petersen
Browse files

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: default avatarSumit Saxena <sumit.saxena@broadcom.com>
Signed-off-by: default avatarRanjan Kumar <ranjan.kumar@broadcom.com>
Link: https://lore.kernel.org/r/20240905102753.105310-5-ranjan.kumar@broadcom.com


Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6e4c825f

drivers/scsi/mpi3mr/mpi3mr_fw.c

+11 −14
Original line number Diff line number Diff line
@@ -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);

		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");