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

Commit 26a2e68f authored by Dan Williams's avatar Dan Williams Committed by James Bottomley
Browse files

[SCSI] libsas: don't recover end devices attached to disabled phys 



If userspace has decided to disable a phy the kernel should honor that
and not inadvertantly re-enable the phy via error recovery.  This is
more straightforward in the sata case where link recovery (via
libata-eh) is separate from sas_task cancelling in libsas-eh.  Teach
libsas to accept -ENODEV as a successful response from I_T_nexus_reset
('successful' in terms of not escalating further).

This is a more comprehensive fix then "libsas: don't recover 'gone'
devices in sas_ata_hard_reset()", as it is no longer sata-specific.

aic94xx does check the return value from sas_phy_reset() so if the phy
is disabled we proceed with clearing the I_T_nexus.

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

drivers/scsi/aic94xx/aic94xx_tmf.c

+1 −1
Original line number Diff line number Diff line
@@ -192,7 +192,7 @@ int asd_I_T_nexus_reset(struct domain_device *dev) 
	ASD_DPRINTK("sending %s reset to %s\n",

		    reset_type ? "hard" : "soft", dev_name(&phy->dev));

	res = sas_phy_reset(phy, reset_type);

	if (res == TMF_RESP_FUNC_COMPLETE) {

	if (res == TMF_RESP_FUNC_COMPLETE || res == -ENODEV) {

		/* wait for the maximum settle time */

		msleep(500);

		/* clear all outstanding commands (keep nexus suspended) */

drivers/scsi/libsas/sas_ata.c

+2 −3
Original line number Diff line number Diff line
@@ -407,10 +407,9 @@ static int sas_ata_hard_reset(struct ata_link *link, unsigned int *class, 
	struct domain_device *dev = ap->private_data;

	struct sas_internal *i = dev_to_sas_internal(dev);



	if (test_bit(SAS_DEV_GONE, &dev->state))

		return -ENODEV;



	res = i->dft->lldd_I_T_nexus_reset(dev);

	if (res == -ENODEV)

		return res;



	if (res != TMF_RESP_FUNC_COMPLETE)

		sas_ata_printk(KERN_DEBUG, dev, "Unable to reset ata device?\n");

drivers/scsi/libsas/sas_init.c

+3 −0
Original line number Diff line number Diff line
@@ -298,6 +298,9 @@ int sas_phy_reset(struct sas_phy *phy, int hard_reset) 
	int ret;

	enum phy_func reset_type;



	if (!phy->enabled)

		return -ENODEV;



	if (hard_reset)

		reset_type = PHY_FUNC_HARD_RESET;

	else

drivers/scsi/libsas/sas_scsi_host.c

+2 −1
Original line number Diff line number Diff line
@@ -607,7 +607,8 @@ static void sas_eh_handle_sas_errors(struct Scsi_Host *shost, struct list_head * 
			SAS_DPRINTK("task 0x%p is not at LU: I_T recover\n",

				    task);

			tmf_resp = sas_recover_I_T(task->dev);

			if (tmf_resp == TMF_RESP_FUNC_COMPLETE) {

			if (tmf_resp == TMF_RESP_FUNC_COMPLETE ||

			    tmf_resp == -ENODEV) {

				struct domain_device *dev = task->dev;

				SAS_DPRINTK("I_T %016llx recovered\n",

					    SAS_ADDR(task->dev->sas_addr));