[PATCH] ahci: do not fail softreset if PHY reports no device

All softreset methods are responsible for detecting device presence
and succeed softreset in such cases.  AHCI didn't use to check for
device presence before proceeding with softreset and this caused
unnecessary reset retrials during probing.  This patch adds presence
detection to AHCI softreset.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jeff@garzik.org>

1 files changed, 6 insertions, 0 deletions

diff --git a/drivers/scsi/ahci.c b/drivers/scsi/ahci.c
index 0c5f0c844d21..ff48066d4c4f 100644
--- a/drivers/scsi/ahci.c
+++ b/drivers/scsi/ahci.c
@@ -549,6 +549,12 @@ static int ahci_softreset(struct ata_port *ap, int verbose, unsigned int *class)
 
         DPRINTK("ENTER\n");
 
+        if (!sata_dev_present(ap)) {
+                DPRINTK("PHY reports no device\n");
+                *class = ATA_DEV_NONE;
+                return 0;
+        }
+
         /* prepare for SRST (AHCI-1.1 10.4.1) */
         rc = ahci_stop_engine(ap);
         if (rc) {