Commit 82b2fb52 authored by Hannes Reinecke's avatar Hannes Reinecke Committed by Martin K. Petersen
Browse files

scsi: mpi3mr: Split off bus_reset function from host_reset 



SCSI EH host reset is the final callback in the escalation chain; once we
reach this we need to reset the controller.  As such it defeats the purpose
to skip controller reset if no I/Os are pending and the RAID device is to
be reset; especially after kexec there might be stale commands pending in
firmware for which we have no reference whatsoever.  So this patch splits
off the check for pending I/O into a 'bus_reset' function, and leaves the
actual controller reset to the host reset.

Signed-off-by: default avatarHannes Reinecke <hare@suse.de>
Link: https://lore.kernel.org/r/20231002154328.43718-19-hare@suse.de


Cc: Kashyap Desai <kashyap.desai@broadcom.com>
Cc: Sathya Prakash Veerichetty <sathya.prakash@broadcom.com>
Cc: Sumit Saxena <sumit.saxena@broadcom.com>
Cc: Sreekanth Reddy <sreekanth.reddy@broadcom.com>
Reviewed-by: default avatarChristoph Hellwig <hch@lst.de>
Reviewed-by: default avatarJohannes Thumshirn <johannes.thumshirn@wdc.com>
Signed-off-by: default avatarMartin K. Petersen <martin.petersen@oracle.com>
parent c2a14ab3

drivers/scsi/mpi3mr/mpi3mr_os.c

+37 −20
Original line number Diff line number Diff line
@@ -4012,20 +4012,45 @@ static inline void mpi3mr_setup_divert_ws(struct mpi3mr_ioc *mrioc, 
 * mpi3mr_eh_host_reset - Host reset error handling callback

 * @scmd: SCSI command reference

 *

 * Issue controller reset if the scmd is for a Physical Device,

 * if the scmd is for RAID volume, then wait for

 * MPI3MR_RAID_ERRREC_RESET_TIMEOUT and checke whether any

 * pending I/Os prior to issuing reset to the controller.

 * Issue controller reset

 *

 * Return: SUCCESS of successful reset else FAILED

 */

static int mpi3mr_eh_host_reset(struct scsi_cmnd *scmd)

{

	struct mpi3mr_ioc *mrioc = shost_priv(scmd->device->host);

	int retval = FAILED, ret;



	ret = mpi3mr_soft_reset_handler(mrioc,

	    MPI3MR_RESET_FROM_EH_HOS, 1);

	if (ret)

		goto out;



	retval = SUCCESS;

out:

	sdev_printk(KERN_INFO, scmd->device,

	    "Host reset is %s for scmd(%p)\n",

	    ((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);



	return retval;

}



/**

 * mpi3mr_eh_bus_reset - Bus reset error handling callback

 * @scmd: SCSI command reference

 *

 * Checks whether pending I/Os are present for the RAID volume;

 * if not there's no need to reset the adapter.

 *

 * Return: SUCCESS of successful reset else FAILED

 */

static int mpi3mr_eh_bus_reset(struct scsi_cmnd *scmd)

{

	struct mpi3mr_ioc *mrioc = shost_priv(scmd->device->host);

	struct mpi3mr_stgt_priv_data *stgt_priv_data;

	struct mpi3mr_sdev_priv_data *sdev_priv_data;

	u8 dev_type = MPI3_DEVICE_DEVFORM_VD;

	int retval = FAILED, ret;

	int retval = FAILED;



	sdev_priv_data = scmd->device->hostdata;

	if (sdev_priv_data && sdev_priv_data->tgt_priv_data) {
@@ -4036,24 +4061,15 @@ static int mpi3mr_eh_host_reset(struct scsi_cmnd *scmd) 
	if (dev_type == MPI3_DEVICE_DEVFORM_VD) {

		mpi3mr_wait_for_host_io(mrioc,

			MPI3MR_RAID_ERRREC_RESET_TIMEOUT);

		if (!mpi3mr_get_fw_pending_ios(mrioc)) {

		if (!mpi3mr_get_fw_pending_ios(mrioc))

			retval = SUCCESS;

			goto out;

		}

	}



	if (retval == FAILED)

		mpi3mr_print_pending_host_io(mrioc);

	ret = mpi3mr_soft_reset_handler(mrioc,

	    MPI3MR_RESET_FROM_EH_HOS, 1);

	if (ret)

		goto out;



	retval = SUCCESS;

out:

	sdev_printk(KERN_INFO, scmd->device,

	    "Host reset is %s for scmd(%p)\n",

		"Bus reset is %s for scmd(%p)\n",

		((retval == SUCCESS) ? "SUCCESS" : "FAILED"), scmd);



	return retval;

}
@@ -4900,6 +4916,7 @@ static const struct scsi_host_template mpi3mr_driver_template = { 
	.change_queue_depth		= mpi3mr_change_queue_depth,

	.eh_device_reset_handler	= mpi3mr_eh_dev_reset,

	.eh_target_reset_handler	= mpi3mr_eh_target_reset,

	.eh_bus_reset_handler		= mpi3mr_eh_bus_reset,

	.eh_host_reset_handler		= mpi3mr_eh_host_reset,

	.bios_param			= mpi3mr_bios_param,

	.map_queues			= mpi3mr_map_queues,