From: Tejun Heo <htejun@gmail.com>
Date: Wed, 31 May 2006 09:27:23 +0000 (+0900)
Subject: [PATCH] libata: set PIO-0 after successful EH reset
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=20952b699035448d2277c64efc5910a31be66ed1;p=mv-sheeva.git

[PATCH] libata: set PIO-0 after successful EH reset

Set ata_device->pio_mode to XFER_PIO_0 after a successful reset.  This
is to keep EH resets consistent with probe resets as updated by the
commit b6079ca409bf88c248992e96510dd6f610f7ed89.  Note that, with
soon-to-follow hotplug update, EH resets will include probe resets.

Signed-off-by: Tejun Heo <htejun@gmail.com>
---

diff --git a/drivers/scsi/libata-eh.c b/drivers/scsi/libata-eh.c
index 71b45ad2c12..b88f492eab1 100644
--- a/drivers/scsi/libata-eh.c
+++ b/drivers/scsi/libata-eh.c
@@ -1287,7 +1287,7 @@ static int ata_eh_reset(struct ata_port *ap, ata_reset_fn_t softreset,
 	unsigned int classes[ATA_MAX_DEVICES];
 	int tries = ATA_EH_RESET_TRIES;
 	ata_reset_fn_t reset;
-	int rc;
+	int i, rc;
 
 	if (softreset && (!hardreset || (!sata_set_spd_needed(ap) &&
 					 !(ehc->i.action & ATA_EH_HARDRESET))))
@@ -1319,6 +1319,12 @@ static int ata_eh_reset(struct ata_port *ap, ata_reset_fn_t softreset,
 	}
 
 	if (rc == 0) {
+		/* After the reset, the device state is PIO 0 and the
+		 * controller state is undefined.  Record the mode.
+		 */
+		for (i = 0; i < ATA_MAX_DEVICES; i++)
+			ap->device[i].pio_mode = XFER_PIO_0;
+
 		if (postreset)
 			postreset(ap, classes);