libata: kill ATA_EHI_RESUME_LINK

[mv-sheeva.git] / drivers / ata / libata-pmp.c

diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index d91f5090ba9d0d062e70d324b4e6566295e93d55..df1d3252b9e611946279f6e0de52bc070b1cb51f 100644 (file)
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -194,15 +194,6 @@ int sata_pmp_std_prereset(struct ata_link *link, unsigned long deadline)
        const unsigned long *timing = sata_ehc_deb_timing(ehc);
        int rc;
 
-       /* force HRST? */
-       if (link->flags & ATA_LFLAG_NO_SRST)
-               ehc->i.action |= ATA_EH_HARDRESET;
-
-       /* handle link resume */
-       if ((ehc->i.flags & ATA_EHI_RESUME_LINK) &&
-           (link->flags & ATA_LFLAG_HRST_TO_RESUME))
-               ehc->i.action |= ATA_EH_HARDRESET;
-
        /* if we're about to do hardreset, nothing more to do */
        if (ehc->i.action & ATA_EH_HARDRESET)
                return 0;
@@ -445,8 +436,7 @@ static int sata_pmp_init_links(struct ata_port *ap, int nr_ports)
 
                link->flags = 0;
                ehc->i.probe_mask |= 1;
-               ehc->i.action |= ATA_EH_SOFTRESET;
-               ehc->i.flags |= ATA_EHI_RESUME_LINK;
+               ehc->i.action |= ATA_EH_RESET;
        }
 
        return 0;
@@ -462,9 +452,6 @@ static void sata_pmp_quirks(struct ata_port *ap)
        if (vendor == 0x1095 && devid == 0x3726) {
                /* sil3726 quirks */
                ata_port_for_each_link(link, ap) {
-                       /* SError.N need a kick in the ass to get working */
-                       link->flags |= ATA_LFLAG_HRST_TO_RESUME;
-
                        /* class code report is unreliable */
                        if (link->pmp < 5)
                                link->flags |= ATA_LFLAG_ASSUME_ATA;
@@ -477,9 +464,6 @@ static void sata_pmp_quirks(struct ata_port *ap)
        } else if (vendor == 0x1095 && devid == 0x4723) {
                /* sil4723 quirks */
                ata_port_for_each_link(link, ap) {
-                       /* SError.N need a kick in the ass to get working */
-                       link->flags |= ATA_LFLAG_HRST_TO_RESUME;
-
                        /* class code report is unreliable */
                        if (link->pmp < 2)
                                link->flags |= ATA_LFLAG_ASSUME_ATA;
@@ -492,9 +476,6 @@ static void sata_pmp_quirks(struct ata_port *ap)
        } else if (vendor == 0x1095 && devid == 0x4726) {
                /* sil4726 quirks */
                ata_port_for_each_link(link, ap) {
-                       /* SError.N need a kick in the ass to get working */
-                       link->flags |= ATA_LFLAG_HRST_TO_RESUME;
-
                        /* Class code report is unreliable and SRST
                         * times out under certain configurations.
                         * Config device can be at port 0 or 5 and
@@ -522,13 +503,6 @@ static void sata_pmp_quirks(struct ata_port *ap)
                 * otherwise.  Don't try hard to recover it.
                 */
                ap->pmp_link[ap->nr_pmp_links - 1].flags |= ATA_LFLAG_NO_RETRY;
-       } else if (vendor == 0x11ab && devid == 0x4140) {
-               /* Marvell 88SM4140 quirks.  Fan-out ports require PHY
-                * reset to work; other than that, it behaves very
-                * nicely.
-                */
-               ata_port_for_each_link(link, ap)
-                       link->flags |= ATA_LFLAG_HRST_TO_RESUME;
        }
 }
 
@@ -840,13 +814,12 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
  retry:
        ehc->classes[0] = ATA_DEV_UNKNOWN;
 
-       if (ehc->i.action & ATA_EH_RESET_MASK) {
+       if (ehc->i.action & ATA_EH_RESET) {
                struct ata_link *tlink;
 
                ata_eh_freeze_port(ap);
 
                /* reset */
-               ehc->i.action = ATA_EH_HARDRESET;
                rc = ata_eh_reset(link, 0, prereset, softreset, hardreset,
                                  postreset);
                if (rc) {
@@ -890,11 +863,11 @@ static int sata_pmp_eh_recover_pmp(struct ata_port *ap,
                                reval_failed = 1;
 
                        ata_dev_printk(dev, KERN_WARNING,
-                                      "retrying hardreset%s\n",
+                                      "retrying reset%s\n",
                                       sleep ? " in 5 secs" : "");
                        if (sleep)
                                ssleep(5);
-                       ehc->i.action |= ATA_EH_HARDRESET;
+                       ehc->i.action |= ATA_EH_RESET;
                        goto retry;
                } else {
                        ata_dev_printk(dev, KERN_ERR, "failed to recover PMP "
@@ -938,10 +911,8 @@ static int sata_pmp_eh_handle_disabled_links(struct ata_port *ap)
                /* Some PMPs require hardreset sequence to get
                 * SError.N working.
                 */
-               if ((link->flags & ATA_LFLAG_HRST_TO_RESUME) &&
-                   (link->eh_context.i.flags & ATA_EHI_RESUME_LINK))
-                       sata_link_hardreset(link, sata_deb_timing_normal,
-                                           jiffies + ATA_TMOUT_INTERNAL_QUICK);
+               sata_link_hardreset(link, sata_deb_timing_normal,
+                                   jiffies + ATA_TMOUT_INTERNAL_QUICK);
 
                /* unconditionally clear SError.N */
                rc = sata_scr_write(link, SCR_ERROR, SERR_PHYRDY_CHG);
@@ -1124,7 +1095,7 @@ static int sata_pmp_eh_recover(struct ata_port *ap,
 
  link_fail:
        if (sata_pmp_handle_link_fail(link, link_tries)) {
-               pmp_ehc->i.action |= ATA_EH_HARDRESET;
+               pmp_ehc->i.action |= ATA_EH_RESET;
                goto retry;
        }
 
@@ -1142,7 +1113,7 @@ static int sata_pmp_eh_recover(struct ata_port *ap,
        if (--pmp_tries) {
                ata_port_printk(ap, KERN_WARNING,
                                "failed to recover PMP, retrying in 5 secs\n");
-               pmp_ehc->i.action |= ATA_EH_HARDRESET;
+               pmp_ehc->i.action |= ATA_EH_RESET;
                ssleep(5);
                goto retry;
        }