Commit 5a998328 authored by Dan Williams's avatar Dan Williams Committed by James Bottomley

[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: default avatarDan Williams <dan.j.williams@intel.com>
Signed-off-by: default avatarJames Bottomley <JBottomley@Parallels.com>
parent 6a719391
...@@ -1308,7 +1308,6 @@ void isci_remote_device_release(struct kref *kref) ...@@ -1308,7 +1308,6 @@ void isci_remote_device_release(struct kref *kref)
clear_bit(IDEV_STOP_PENDING, &idev->flags); clear_bit(IDEV_STOP_PENDING, &idev->flags);
clear_bit(IDEV_IO_READY, &idev->flags); clear_bit(IDEV_IO_READY, &idev->flags);
clear_bit(IDEV_GONE, &idev->flags); clear_bit(IDEV_GONE, &idev->flags);
clear_bit(IDEV_EH, &idev->flags);
smp_mb__before_clear_bit(); smp_mb__before_clear_bit();
clear_bit(IDEV_ALLOCATED, &idev->flags); clear_bit(IDEV_ALLOCATED, &idev->flags);
wake_up(&ihost->eventq); wake_up(&ihost->eventq);
......
...@@ -82,10 +82,9 @@ struct isci_remote_device { ...@@ -82,10 +82,9 @@ struct isci_remote_device {
#define IDEV_START_PENDING 0 #define IDEV_START_PENDING 0
#define IDEV_STOP_PENDING 1 #define IDEV_STOP_PENDING 1
#define IDEV_ALLOCATED 2 #define IDEV_ALLOCATED 2
#define IDEV_EH 3 #define IDEV_GONE 3
#define IDEV_GONE 4 #define IDEV_IO_READY 4
#define IDEV_IO_READY 5 #define IDEV_IO_NCQERROR 5
#define IDEV_IO_NCQERROR 6
unsigned long flags; unsigned long flags;
struct kref kref; struct kref kref;
struct isci_port *isci_port; struct isci_port *isci_port;
......
...@@ -846,7 +846,6 @@ int isci_task_lu_reset(struct domain_device *dev, u8 *lun) ...@@ -846,7 +846,6 @@ int isci_task_lu_reset(struct domain_device *dev, u8 *lun)
ret = TMF_RESP_FUNC_COMPLETE; ret = TMF_RESP_FUNC_COMPLETE;
goto out; goto out;
} }
set_bit(IDEV_EH, &isci_device->flags);
/* Send the task management part of the reset. */ /* Send the task management part of the reset. */
if (dev_is_sata(dev)) { if (dev_is_sata(dev)) {
...@@ -981,9 +980,6 @@ int isci_task_abort_task(struct sas_task *task) ...@@ -981,9 +980,6 @@ int isci_task_abort_task(struct sas_task *task)
"%s: dev = %p, task = %p, old_request == %p\n", "%s: dev = %p, task = %p, old_request == %p\n",
__func__, isci_device, task, old_request); __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 /* Device reset conditions signalled in task_state_flags are the
* responsbility of libsas to observe at the start of the error * responsbility of libsas to observe at the start of the error
* handler thread. * handler thread.
...@@ -1312,7 +1308,10 @@ int isci_task_I_T_nexus_reset(struct domain_device *dev) ...@@ -1312,7 +1308,10 @@ int isci_task_I_T_nexus_reset(struct domain_device *dev)
idev = isci_lookup_device(dev); idev = isci_lookup_device(dev);
spin_unlock_irqrestore(&ihost->scic_lock, flags); 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; ret = TMF_RESP_FUNC_COMPLETE;
goto out; goto out;
} }
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment