5 files changed, 7 insertions, 40 deletions

diff --git a/drivers/ata/libata-core.c b/drivers/ata/libata-core.c
index e00b620f161a..2da579b46bdd 100644
--- a/drivers/ata/libata-core.c
+++ b/drivers/ata/libata-core.c
@@ -91,7 +91,7 @@ const struct ata_port_operations sata_pmp_port_ops = {
         .inherits               = &sata_port_ops,
 
         .pmp_prereset           = ata_std_prereset,
-        .pmp_hardreset          = sata_pmp_std_hardreset,
+        .pmp_hardreset          = sata_std_hardreset,
         .pmp_postreset          = ata_std_postreset,
         .error_handler          = sata_pmp_error_handler,
 };
@@ -6307,7 +6307,6 @@ EXPORT_SYMBOL_GPL(ata_pci_device_resume);
 #endif /* CONFIG_PCI */
 
 EXPORT_SYMBOL_GPL(sata_pmp_qc_defer_cmd_switch);
-EXPORT_SYMBOL_GPL(sata_pmp_std_hardreset);
 EXPORT_SYMBOL_GPL(sata_pmp_error_handler);
 
 EXPORT_SYMBOL_GPL(__ata_ehi_push_desc);
diff --git a/drivers/ata/libata-eh.c b/drivers/ata/libata-eh.c
index 21687bbd9a70..d8c4a45dcf26 100644
--- a/drivers/ata/libata-eh.c
+++ b/drivers/ata/libata-eh.c
@@ -2276,6 +2276,11 @@ int ata_eh_reset(struct ata_link *link, int classify,
         return rc;
 
  fail:
+        /* if SCR isn't accessible on a fan-out port, PMP needs to be reset */
+        if (!ata_is_host_link(link) &&
+            sata_scr_read(link, SCR_STATUS, &sstatus))
+                rc = -ERESTART;
+
         if (rc == -ERESTART || try >= max_tries)
                 goto out;
 
diff --git a/drivers/ata/libata-pmp.c b/drivers/ata/libata-pmp.c
index 2f8a9577c26d..9c998611b644 100644
--- a/drivers/ata/libata-pmp.c
+++ b/drivers/ata/libata-pmp.c
@@ -176,41 +176,6 @@ int sata_pmp_scr_write(struct ata_link *link, int reg, u32 val)
 }
 
 /**
- *      sata_pmp_std_hardreset - standard hardreset method for PMP link
- *      @link: link to be reset
- *      @class: resulting class of attached device
- *      @deadline: deadline jiffies for the operation
- *
- *      Hardreset PMP port @link.  Note that this function doesn't
- *      wait for BSY clearance.  There simply isn't a generic way to
- *      wait the event.  Instead, this function return -EAGAIN thus
- *      telling libata-EH to followup with softreset.
- *
- *      LOCKING:
- *      Kernel thread context (may sleep)
- *
- *      RETURNS:
- *      0 on success, -errno otherwise.
- */
-int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class,
-                           unsigned long deadline)
-{
-        u32 tmp;
-        int rc;
-
-        DPRINTK("ENTER\n");
-
-        rc = sata_std_hardreset(link, class, deadline);
-
-        /* if SCR isn't accessible, we need to reset the PMP */
-        if (rc && rc != -EAGAIN && sata_scr_read(link, SCR_STATUS, &tmp))
-                rc = -ERESTART;
-
-        DPRINTK("EXIT, rc=%d\n", rc);
-        return rc;
-}
-
-/**
  *      sata_pmp_read_gscr - read GSCR block of SATA PMP
  *      @dev: PMP device
  *      @gscr: buffer to read GSCR block into
diff --git a/drivers/ata/sata_sil24.c b/drivers/ata/sata_sil24.c
index b83851f6e068..fc9d48cd8122 100644
--- a/drivers/ata/sata_sil24.c
+++ b/drivers/ata/sata_sil24.c
@@ -944,7 +944,7 @@ static int sil24_pmp_hardreset(struct ata_link *link, unsigned int *class,
                 return rc;
         }
 
-        return sata_pmp_std_hardreset(link, class, deadline);
+        return sata_std_hardreset(link, class, deadline);
 }
 
 static void sil24_freeze(struct ata_port *ap)
diff --git a/include/linux/libata.h b/include/linux/libata.h
index b9188371b12a..2b5a0b77e179 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -1025,8 +1025,6 @@ static inline int ata_acpi_cbl_80wire(struct ata_port *ap,
  * PMP - drivers/ata/libata-pmp.c
  */
 extern int sata_pmp_qc_defer_cmd_switch(struct ata_queued_cmd *qc);
-extern int sata_pmp_std_hardreset(struct ata_link *link, unsigned int *class,
-                                  unsigned long deadline);
 extern void sata_pmp_error_handler(struct ata_port *ap);
 
 /*