1 files changed, 12 insertions, 3 deletions

diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 39f556c02992..2bff9adcacf1 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -1056,7 +1056,7 @@ static void ata_eh_analyze_serror(struct ata_port *ap)
         }
         if (serror & SERR_INTERNAL) {
                 err_mask |= AC_ERR_SYSTEM;
-                action |= ATA_EH_SOFTRESET;
+                action |= ATA_EH_HARDRESET;
         }
         if (serror & (SERR_PHYRDY_CHG | SERR_DEV_XCHG))
                 ata_ehi_hotplugged(&ehc->i);
@@ -1151,7 +1151,9 @@ static unsigned int ata_eh_analyze_tf(struct ata_queued_cmd *qc,
                 return ATA_EH_SOFTRESET;
         }
 
-        if (!(qc->err_mask & AC_ERR_DEV))
+        if (stat & (ATA_ERR | ATA_DF))
+                qc->err_mask |= AC_ERR_DEV;
+        else
                 return 0;
 
         switch (qc->dev->class) {
@@ -1669,7 +1671,10 @@ static int ata_eh_reset(struct ata_port *ap, int classify,
                                 reset == softreset ? "soft" : "hard");
 
         /* mark that this EH session started with reset */
-        ehc->i.flags |= ATA_EHI_DID_RESET;
+        if (reset == hardreset)
+                ehc->i.flags |= ATA_EHI_DID_HARDRESET;
+        else
+                ehc->i.flags |= ATA_EHI_DID_SOFTRESET;
 
         rc = ata_do_reset(ap, reset, classes);
 
@@ -1808,6 +1813,10 @@ static int ata_eh_revalidate_and_attach(struct ata_port *ap,
                 }
         }
 
+        /* PDIAG- should have been released, ask cable type if post-reset */
+        if ((ehc->i.flags & ATA_EHI_DID_RESET) && ap->ops->cable_detect)
+                ap->cbl = ap->ops->cable_detect(ap);
+
         /* Configure new devices forward such that user doesn't see
          * device detection messages backwards.
          */