libata: move generic hardreset code from sata_sff_hardreset() to sata_link_hardreset()

sata_sff_hardreset() contains link readiness wait logic which isn't
SFF specific.  Move that part into sata_link_hardreset(), which now
takes two more parameters - @online and @check_ready.  Both are
optional.  The former is out parameter for link onlineness after
reset.  The latter is used to wait for link readiness after hardreset.

Users of sata_link_hardreset() is updated to use new funtionality and
ahci_hardreset() is updated to use sata_link_hardreset() instead of
sata_sff_hardreset().  This doesn't really cause any behavior change.

Signed-off-by: Tejun Heo <htejun@gmail.com>

1 files changed, 9 insertions, 1 deletions

diff --git a/include/linux/libata.h b/include/linux/libata.h
index 4bbf2524e473..d9ebce2bf5e7 100644
--- a/include/linux/libata.h
+++ b/include/linux/libata.h
@@ -261,6 +261,13 @@ enum {
          */
         ATA_WAIT_AFTER_RESET_MSECS = 150,
 
+        /* If PMP is supported, we have to do follow-up SRST.  As some
+         * PMPs don't send D2H Reg FIS after hardreset, LLDs are
+         * advised to wait only for the following duration before
+         * doing SRST.
+         */
+        ATA_TMOUT_PMP_SRST_WAIT = 1 * HZ,
+
         /* ATA bus states */
         BUS_UNKNOWN             = 0,
         BUS_DMA                 = 1,
@@ -844,7 +851,8 @@ extern int sata_link_debounce(struct ata_link *link,
 extern int sata_link_resume(struct ata_link *link, const unsigned long *params,
                             unsigned long deadline);
 extern int sata_link_hardreset(struct ata_link *link,
-                        const unsigned long *timing, unsigned long deadline);
+                        const unsigned long *timing, unsigned long deadline,
+                        bool *online, int (*check_ready)(struct ata_link *));
 extern void ata_std_postreset(struct ata_link *link, unsigned int *classes);
 extern void ata_port_disable(struct ata_port *);