1 files changed, 23 insertions, 2 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 8cb35bb87605..ec55d63cf20e 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2083,6 +2083,25 @@ int ata_eh_reset(struct ata_link *link, int classify,
 
         ata_eh_about_to_do(link, NULL, ehc->i.action & ATA_EH_RESET_MASK);
 
+        ata_link_for_each_dev(dev, link) {
+                /* If we issue an SRST then an ATA drive (not ATAPI)
+                 * may change configuration and be in PIO0 timing. If
+                 * we do a hard reset (or are coming from power on)
+                 * this is true for ATA or ATAPI. Until we've set a
+                 * suitable controller mode we should not touch the
+                 * bus as we may be talking too fast.
+                 */
+                dev->pio_mode = XFER_PIO_0;
+
+                /* If the controller has a pio mode setup function
+                 * then use it to set the chipset to rights. Don't
+                 * touch the DMA setup as that will be dealt with when
+                 * configuring devices.
+                 */
+                if (ap->ops->set_piomode)
+                        ap->ops->set_piomode(ap, dev);
+        }
+
         /* Determine which reset to use and record in ehc->i.action.
          * prereset() may examine and modify it.
          */
@@ -2208,9 +2227,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
                 ata_link_for_each_dev(dev, link) {
                         /* After the reset, the device state is PIO 0
                          * and the controller state is undefined.
-                         * Record the mode.
+                         * Reset also wakes up drives from sleeping
+                         * mode.
                          */
                         dev->pio_mode = XFER_PIO_0;
+                        dev->flags &= ~ATA_DFLAG_SLEEPING;
 
                         if (ata_link_offline(link))
                                 continue;
@@ -2416,7 +2437,7 @@ static int ata_eh_handle_dev_fail(struct ata_device *dev, int err)
                 /* give it just one more chance */
                 ehc->tries[dev->devno] = min(ehc->tries[dev->devno], 1);
         case -EIO:
-                if (ehc->tries[dev->devno] == 1) {
+                if (ehc->tries[dev->devno] == 1 && dev->pio_mode > XFER_PIO_0) {
                         /* This is the last chance, better to slow
                          * down than lose it.
                          */