Commit 66f1c2b4 authored by Kevin Barnett's avatar Kevin Barnett Committed by Martin K. Petersen
Browse files

scsi: smartpqi: Update device scan operations 

Change return type from EINPROGRESS to EBUSY to signal applications to
retry a REGNEWD if the driver cannot process the REGNEWD. Events such as
OFA, suspend, and shutdown return EINPROGRESS if a scan is currently
running. This prevents applications from immediately retrying REGNEWD.

Schedule a new REGNEWD if system low on memory.

Link: https://lore.kernel.org/r/161549382157.25025.16054784597622125373.stgit@brunhilda


Reviewed-by: default avatarScott Benesh <scott.benesh@microchip.com>
Reviewed-by: default avatarMike McGowen <mike.mcgowen@microchip.com>
Reviewed-by: default avatarScott Teel <scott.teel@microchip.com>
Signed-off-by: default avatarKevin Barnett <kevin.barnett@microchip.com>
Signed-off-by: default avatarDon Brace <don.brace@microchip.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent 2790cd4d

drivers/scsi/smartpqi/smartpqi_init.c

+14 −8
Original line number Diff line number Diff line
@@ -2312,20 +2312,26 @@ static int pqi_update_scsi_devices(struct pqi_ctrl_info *ctrl_info) 


static int pqi_scan_scsi_devices(struct pqi_ctrl_info *ctrl_info)

{

	int rc = 0;

	int rc;

	int mutex_acquired;



	if (pqi_ctrl_offline(ctrl_info))

		return -ENXIO;



	if (!mutex_trylock(&ctrl_info->scan_mutex)) {

	mutex_acquired = mutex_trylock(&ctrl_info->scan_mutex);



	if (!mutex_acquired) {

		if (pqi_ctrl_scan_blocked(ctrl_info))

			return -EBUSY;

		pqi_schedule_rescan_worker_delayed(ctrl_info);

		rc = -EINPROGRESS;

	} else {

		return -EINPROGRESS;

	}



	rc = pqi_update_scsi_devices(ctrl_info);

		if (rc)

	if (rc && !pqi_ctrl_scan_blocked(ctrl_info))

		pqi_schedule_rescan_worker_delayed(ctrl_info);



	mutex_unlock(&ctrl_info->scan_mutex);

	}



	return rc;

}