[PATCH] libata: new ->probe_reset operation

Add new ->probe_reset operation to ata_port_operations obsoleting
->phy_reset.  The main difference from ->phy_reset is that the new
operation is not allowed to manipulate libata internals directly.
It's not allowed to configure or disable the port or devices.  It can
only succeed or fail and classify attached devices into passed
@classes.

This change gives more control to higher level and eases sharing reset
methods with EH.

Signed-off-by: Tejun Heo <htejun@gmail.com>
Signed-off-by: Jeff Garzik <jgarzik@pobox.com>

1 files changed, 18 insertions, 1 deletions

diff --git a/drivers/scsi/libata-core.c b/drivers/scsi/libata-core.c
index 1f78e246f5e..147e1461062 100644
--- a/drivers/scsi/libata-core.c
+++ b/drivers/scsi/libata-core.c
@@ -1485,7 +1485,24 @@ static int ata_bus_probe(struct ata_port *ap)
 {
         unsigned int i, found = 0;
 
-        ap->ops->phy_reset(ap);
+        if (ap->ops->probe_reset) {
+                unsigned int classes[ATA_MAX_DEVICES];
+                int rc;
+
+                ata_port_probe(ap);
+
+                rc = ap->ops->probe_reset(ap, classes);
+                if (rc == 0) {
+                        for (i = 0; i < ATA_MAX_DEVICES; i++)
+                                ap->device[i].class = classes[i];
+                } else {
+                        printk(KERN_ERR "ata%u: probe reset failed, "
+                               "disabling port\n", ap->id);
+                        ata_port_disable(ap);
+                }
+        } else
+                ap->ops->phy_reset(ap);
+
         if (ap->flags & ATA_FLAG_PORT_DISABLED)
                 goto err_out;