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

Commit 7c8c2cff authored by Tejun Heo's avatar Tejun Heo Committed by Jeff Garzik
Browse files

[PATCH] libata: fix eh_skip_recovery condition 



* (ata_dev_absent() || ata_dev_ready()) test doesn't indicate
  SUSPENDED state properly.  Fix it.

* Link resuming resets shouldn't be skipped.  Don't skip recovery on
  EHI_RESUME_LINK.  This doesn't matter for host ports as EHI_RESUME
  always coincides with EHI_HOTPLUGGED which makes attached disabled
  devices vacant.  However, PMP reset causes non-hotplug link-resuming
  resets which shouldn't be skipped.

Signed-off-by: default avatarTejun Heo <htejun@gmail.com>
Signed-off-by: default avatarJeff Garzik <jeff@garzik.org>
parent 4528e4da

drivers/scsi/libata-eh.c

+4 −3
Original line number Diff line number Diff line
@@ -1843,15 +1843,16 @@ static int ata_eh_skip_recovery(struct ata_port *ap) 
	for (i = 0; i < ata_port_max_devices(ap); i++) {

		struct ata_device *dev = &ap->device[i];



		if (ata_dev_absent(dev) || ata_dev_ready(dev))

		if (!(dev->flags & ATA_DFLAG_SUSPENDED))

			break;

	}



	if (i == ata_port_max_devices(ap))

		return 1;



	/* always thaw frozen port and recover failed devices */

	if (ap->pflags & ATA_PFLAG_FROZEN || ata_port_nr_enabled(ap))

	/* thaw frozen port, resume link and recover failed devices */

	if ((ap->pflags & ATA_PFLAG_FROZEN) ||

	    (ehc->i.flags & ATA_EHI_RESUME_LINK) || ata_port_nr_enabled(ap))

		return 0;



	/* skip if class codes for all vacant slots are ATA_DEV_NONE */