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

Commit 6a719391 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] isci: remove bus and reset handlers 



Remove ->eh_device_reset_handler() and ->eh_bus_reset_handler() for the
same reason they are not implemented for libata hosts, they cannot be
implemented reliably with ata-eh.  ATA error recovery wants to divert
all resets to the eh thread and wait for completion, these handlers may
be invoked from a non-blocking ioctl.

The other path they are called from is libsas-eh, and if we escalate
past I_T_nexus reset we have larger problems i.e. tear down all
in-flight commands in the domain potentially without notification to the
lldd if it has chosen not to implement ->lldd_clear_nexus_port() /
->lldd_clear_nexus_ha().

Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 687833a0

drivers/scsi/isci/init.c

+0 −2
Original line number Diff line number Diff line
@@ -165,8 +165,6 @@ static struct scsi_host_template isci_sht = { 
	.sg_tablesize			= SG_ALL,

	.max_sectors			= SCSI_DEFAULT_MAX_SECTORS,

	.use_clustering			= ENABLE_CLUSTERING,

	.eh_device_reset_handler	= sas_eh_device_reset_handler,

	.eh_bus_reset_handler		= isci_bus_reset_handler,

	.slave_alloc			= sas_slave_alloc,

	.target_destroy			= sas_target_destroy,

	.ioctl				= sas_ioctl,

drivers/scsi/isci/task.c

+0 −23
Original line number Diff line number Diff line
@@ -1322,26 +1322,3 @@ int isci_task_I_T_nexus_reset(struct domain_device *dev) 
	isci_put_device(idev);

	return ret;

}
 


int isci_bus_reset_handler(struct scsi_cmnd *cmd)

{

	struct domain_device *dev = sdev_to_domain_dev(cmd->device);

	struct isci_host *ihost = dev_to_ihost(dev);

	struct isci_remote_device *idev;

	unsigned long flags;

	int ret;



	spin_lock_irqsave(&ihost->scic_lock, flags);

	idev = isci_lookup_device(dev);

	spin_unlock_irqrestore(&ihost->scic_lock, flags);



	if (!idev) {

		ret = TMF_RESP_FUNC_COMPLETE;

		goto out;

	}



	ret = isci_reset_device(ihost, dev, idev);

 out:

	isci_put_device(idev);

	return ret;

}

drivers/scsi/isci/task.h

+0 −2
Original line number Diff line number Diff line
@@ -208,8 +208,6 @@ int isci_queuecommand( 
	struct scsi_cmnd *scsi_cmd,

	void (*donefunc)(struct scsi_cmnd *));



int isci_bus_reset_handler(struct scsi_cmnd *cmd);



/**

 * enum isci_completion_selection - This enum defines the possible actions to

 *    take with respect to a given request's notification back to libsas.