[SCSI] isci: remove IDEV_EH hack to disable "discovery-time" ata resets

Prior to commit 61aaff49 "isci: filter broadcast change notifications
during SMP phy resets" we borrowed the MVS_DEV_EH approach from the
mvsas driver for preventing ->lldd_I_T_nexus_reset() events during ata
discovery.  This hack was protecting against the old ->phy_reset() in
ata_bus_probe(), but since the conversion to the new error handling this
hack is preventing resets from reaching ata devices.

Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>

3 files changed, 7 insertions, 10 deletions

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index 108238d4510d..934d21ea14e7 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -1308,7 +1308,6 @@ void isci_remote_device_release(struct kref *kref)
         clear_bit(IDEV_STOP_PENDING, &idev->flags);
         clear_bit(IDEV_IO_READY, &idev->flags);
         clear_bit(IDEV_GONE, &idev->flags);
-        clear_bit(IDEV_EH, &idev->flags);
         smp_mb__before_clear_bit();
         clear_bit(IDEV_ALLOCATED, &idev->flags);
         wake_up(&ihost->eventq);
diff --git a/drivers/scsi/isci/remote_device.h b/drivers/scsi/isci/remote_device.h
index 483ee50152f3..98c2801ed089 100644
--- a/drivers/scsi/isci/remote_device.h
+++ b/drivers/scsi/isci/remote_device.h
@@ -82,10 +82,9 @@ struct isci_remote_device {
         #define IDEV_START_PENDING 0
         #define IDEV_STOP_PENDING 1
         #define IDEV_ALLOCATED 2
-        #define IDEV_EH 3
-        #define IDEV_GONE 4
-        #define IDEV_IO_READY 5
-        #define IDEV_IO_NCQERROR 6
+        #define IDEV_GONE 3
+        #define IDEV_IO_READY 4
+        #define IDEV_IO_NCQERROR 5
         unsigned long flags;
         struct kref kref;
         struct isci_port *isci_port;
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index 530697957481..374254ede9d4 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -846,7 +846,6 @@ int isci_task_lu_reset(struct domain_device *dev, u8 *lun)
                 ret = TMF_RESP_FUNC_COMPLETE;
                 goto out;
         }
-        set_bit(IDEV_EH, &isci_device->flags);
 
         /* Send the task management part of the reset. */
         if (dev_is_sata(dev)) {
@@ -981,9 +980,6 @@ int isci_task_abort_task(struct sas_task *task)
                 "%s: dev = %p, task = %p, old_request == %p\n",
                 __func__, isci_device, task, old_request);
 
-        if (isci_device)
-                set_bit(IDEV_EH, &isci_device->flags);
-
         /* Device reset conditions signalled in task_state_flags are the
          * responsbility of libsas to observe at the start of the error
          * handler thread.
@@ -1312,7 +1308,10 @@ int isci_task_I_T_nexus_reset(struct domain_device *dev)
         idev = isci_lookup_device(dev);
         spin_unlock_irqrestore(&ihost->scic_lock, flags);
 
-        if (!idev || !test_bit(IDEV_EH, &idev->flags)) {
+        if (!idev) {
+                /* XXX: need to cleanup any ireqs targeting this
+                 * domain_device
+                 */
                 ret = TMF_RESP_FUNC_COMPLETE;
                 goto out;
         }