diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-11-30 11:57:34 -0800 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-29 15:11:54 -0600 |
| commit | 9277699121b81891e303ada0a53fa1d04b7ffe72 (patch) | |
| tree | ed8fde54c953025be2a59697dd912f581536c782 /drivers/scsi/isci/port.h | |
| parent | fca4ecbdc440337b3c257b38c2f4cc8d0ca0286c (diff) | |
| download | blackbird-op-linux-9277699121b81891e303ada0a53fa1d04b7ffe72.tar.gz blackbird-op-linux-9277699121b81891e303ada0a53fa1d04b7ffe72.zip | |
[SCSI] isci: fix interpretation of "hard" reset
A hard reset to isci in the direct-attached case is one where the driver
internally manages debouncing the link. In the sas-expander-attached
case a hard reset is one that clears affiliations. The driver should
not be prematurely dropping affiliations at run time, that decision (to
force expander hard resets to ata devices) is left to userspace to
manage. So, arrange for I_T_nexus resets to be sas-link-resets in the
expander-attached case and isci-hard-resets in the direct-attached case.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/port.h')
| -rw-r--r-- | drivers/scsi/isci/port.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/drivers/scsi/isci/port.h b/drivers/scsi/isci/port.h index 265972939e3a..a0dcdaeac3b2 100644 --- a/drivers/scsi/isci/port.h +++ b/drivers/scsi/isci/port.h @@ -98,7 +98,8 @@ struct isci_port { struct isci_host *isci_host; struct list_head remote_dev_list; struct list_head domain_dev_list; - struct completion hard_reset_complete; + #define IPORT_RESET_PENDING 0 + unsigned long state; enum sci_status hard_reset_status; struct sci_base_state_machine sm; bool ready_exit; |
