1 files changed, 17 insertions, 9 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index a93247cc395a..5d687d7cffae 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1206,7 +1206,10 @@ void ata_eh_about_to_do(struct ata_link *link, struct ata_device *dev,
 
         ata_eh_clear_action(link, dev, ehi, action);
 
-        if (!(ehc->i.flags & ATA_EHI_QUIET))
+        /* About to take EH action, set RECOVERED.  Ignore actions on
+         * slave links as master will do them again.
+         */
+        if (!(ehc->i.flags & ATA_EHI_QUIET) && link != ap->slave_link)
                 ap->pflags |= ATA_PFLAG_RECOVERED;
 
         spin_unlock_irqrestore(ap->lock, flags);
@@ -2010,8 +2013,13 @@ void ata_eh_autopsy(struct ata_port *ap)
                 struct ata_eh_context *mehc = &ap->link.eh_context;
                 struct ata_eh_context *sehc = &ap->slave_link->eh_context;
 
+                /* transfer control flags from master to slave */
+                sehc->i.flags |= mehc->i.flags & ATA_EHI_TO_SLAVE_MASK;
+
+                /* perform autopsy on the slave link */
                 ata_eh_link_autopsy(ap->slave_link);
 
+                /* transfer actions from slave to master and clear slave */
                 ata_eh_about_to_do(ap->slave_link, NULL, ATA_EH_ALL_ACTIONS);
                 mehc->i.action          |= sehc->i.action;
                 mehc->i.dev_action[1]   |= sehc->i.dev_action[1];
@@ -2447,14 +2455,14 @@ int ata_eh_reset(struct ata_link *link, int classify,
                 dev->pio_mode = XFER_PIO_0;
                 dev->flags &= ~ATA_DFLAG_SLEEPING;
 
-                if (ata_phys_link_offline(ata_dev_phys_link(dev)))
-                        continue;
-
-                /* apply class override */
-                if (lflags & ATA_LFLAG_ASSUME_ATA)
-                        classes[dev->devno] = ATA_DEV_ATA;
-                else if (lflags & ATA_LFLAG_ASSUME_SEMB)
-                        classes[dev->devno] = ATA_DEV_SEMB_UNSUP; /* not yet */
+                if (!ata_phys_link_offline(ata_dev_phys_link(dev))) {
+                        /* apply class override */
+                        if (lflags & ATA_LFLAG_ASSUME_ATA)
+                                classes[dev->devno] = ATA_DEV_ATA;
+                        else if (lflags & ATA_LFLAG_ASSUME_SEMB)
+                                classes[dev->devno] = ATA_DEV_SEMB_UNSUP;
+                } else
+                        classes[dev->devno] = ATA_DEV_NONE;
         }
 
         /* record current link speed */