Commit 02abcbc2 authored by Suganath Prabu's avatar Suganath Prabu Committed by Martin K. Petersen
Browse files

scsi: mpt3sas: Added new #define variable IOC_OPERATIONAL_WAIT_COUNT 



Added new #define variable IOC_OPERATIONAL_WAIT_COUNT and it replaces hard
coded value '10' in all the places where driver is waiting for the IOC to
become operational.

Signed-off-by: default avatarSuganath Prabu <suganath-prabu.subramani@broadcom.com>
Reviewed-by: default avatarBjorn Helgaas <bhelgaas@google.com>
Reviewed-by: default avatarAndy Shevchenko <andy.shevchenko@gmail.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 6c2938f7

drivers/scsi/mpt3sas/mpt3sas_base.c

+2 −2
Original line number Diff line number Diff line
@@ -5230,7 +5230,7 @@ mpt3sas_base_sas_iounit_control(struct MPT3SAS_ADAPTER *ioc, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			rc = -EFAULT;
@@ -5325,7 +5325,7 @@ mpt3sas_base_scsi_enclosure_processor(struct MPT3SAS_ADAPTER *ioc, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			rc = -EFAULT;

drivers/scsi/mpt3sas/mpt3sas_base.h

+3 −0
Original line number Diff line number Diff line
@@ -140,6 +140,9 @@ 
#define DEFAULT_NUM_FWCHAIN_ELEMTS	8



#define FW_IMG_HDR_READ_TIMEOUT	15



#define IOC_OPERATIONAL_WAIT_COUNT	10



/*

 * NVMe defines

 */

drivers/scsi/mpt3sas/mpt3sas_ctl.c

+1 −1
Original line number Diff line number Diff line
@@ -669,7 +669,7 @@ _ctl_do_mpt_command(struct MPT3SAS_ADAPTER *ioc, struct mpt3_ioctl_command karg, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			ret = -EFAULT;

drivers/scsi/mpt3sas/mpt3sas_transport.c

+4 −4
Original line number Diff line number Diff line
@@ -323,7 +323,7 @@ _transport_expander_report_manufacture(struct MPT3SAS_ADAPTER *ioc, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			rc = -EFAULT;
@@ -1101,7 +1101,7 @@ _transport_get_expander_phy_error_log(struct MPT3SAS_ADAPTER *ioc, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			rc = -EFAULT;
@@ -1406,7 +1406,7 @@ _transport_expander_phy_control(struct MPT3SAS_ADAPTER *ioc, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			rc = -EFAULT;
@@ -1927,7 +1927,7 @@ _transport_smp_handler(struct bsg_job *job, struct Scsi_Host *shost, 
	wait_state_count = 0;

	ioc_state = mpt3sas_base_get_iocstate(ioc, 1);

	while (ioc_state != MPI2_IOC_STATE_OPERATIONAL) {

		if (wait_state_count++ == 10) {

		if (wait_state_count++ == IOC_OPERATIONAL_WAIT_COUNT) {

			ioc_err(ioc, "%s: failed due to ioc not operational\n",

				__func__);

			rc = -EFAULT;

CRA Git | Maintained and supported by SUSTech CRA and CCSE