Skip to contentSkip to conversation

libata: fix eh_skip_recovery condition

PATCH Applied Tejun Heo 2 participants 2 messages Jul 10, 2006 – Jul 19, 2006

Subsystems (2)
SCSI libata
lore
Share & tools
lore

Tejun Heo

author
#0 lore raw

PATCH 1/1 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 Tejun Heo <[email protected]>

---

 drivers/scsi/libata-eh.c |    7 ++++---
 1 files changed, 4 insertions(+), 3 deletions(-)

f971658e0eb5636b7ef67cf0d769f6296e44e914

drivers/scsi/libata-eh.c +4 -3
index 640a035..a9dea3d 100644
@@ -1864,15 +1864,16 @@ static int ata_eh_skip_recovery(struct a
 	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 */
Signature · 1 line
1.3.2