Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 429fab70 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen
Browse files

scsi: smartpqi: increase LUN reset timeout 



Reviewed-by: default avatarScott Benesh <scott.benesh@microsemi.com>
Reviewed-by: default avatarDavid Carroll <david.carroll@microsemi.com>
Reviewed-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microsemi.com>
Signed-off-by: default avatarDon Brace <don.brace@microsemi.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c59c32cd

drivers/scsi/smartpqi/smartpqi_init.c

+8 −4
Original line number Diff line number Diff line
@@ -5660,9 +5660,11 @@ static int pqi_lun_reset(struct pqi_ctrl_info *ctrl_info, 
	return rc;

}



/* Performs a reset at the LUN level. */



#define PQI_LUN_RESET_RETRIES			3

#define PQI_LUN_RESET_RETRY_INTERVAL_MSECS	10000

/* Performs a reset at the LUN level. */

#define PQI_LUN_RESET_PENDING_IO_TIMEOUT_SECS	120



static int _pqi_device_reset(struct pqi_ctrl_info *ctrl_info,

	struct pqi_scsi_dev *device)
@@ -5673,12 +5675,12 @@ static int _pqi_device_reset(struct pqi_ctrl_info *ctrl_info, 


	for (retries = 0;;) {

		rc = pqi_lun_reset(ctrl_info, device);

		if (rc != -EAGAIN ||

		    ++retries > PQI_LUN_RESET_RETRIES)

		if (rc != -EAGAIN || ++retries > PQI_LUN_RESET_RETRIES)

			break;

		msleep(PQI_LUN_RESET_RETRY_INTERVAL_MSECS);

	}

	timeout_secs = rc ? PQI_LUN_RESET_TIMEOUT_SECS : NO_TIMEOUT;



	timeout_secs = rc ? PQI_LUN_RESET_PENDING_IO_TIMEOUT_SECS : NO_TIMEOUT;



	rc |= pqi_device_wait_for_pending_io(ctrl_info, device, timeout_secs);
@@ -5707,6 +5709,7 @@ static int pqi_device_reset(struct pqi_ctrl_info *ctrl_info, 
	pqi_device_reset_done(device);



	mutex_unlock(&ctrl_info->lun_reset_mutex);



	return rc;

}
@@ -5737,6 +5740,7 @@ static int pqi_eh_device_reset_handler(struct scsi_cmnd *scmd) 
	pqi_wait_until_ofa_finished(ctrl_info);



	rc = pqi_device_reset(ctrl_info, device);



out:

	dev_err(&ctrl_info->pci_dev->dev,

		"reset of scsi %d:%d:%d:%d: %s\n",