diff options
| author | Dan Williams <dan.j.williams@intel.com> | 2011-12-09 08:20:44 +0100 |
|---|---|---|
| committer | James Bottomley <JBottomley@Parallels.com> | 2012-02-29 22:13:40 +0100 |
| commit | 43a5ab151f0268459c4368292c2ddb2266b8f243 (patch) | |
| tree | e8ee97e0d49bc0c454ca90f16a836fd01830b11f /drivers/scsi/isci/request.h | |
| parent | [SCSI] isci: fix interpretation of "hard" reset (diff) | |
| download | linux-43a5ab151f0268459c4368292c2ddb2266b8f243.tar.xz linux-43a5ab151f0268459c4368292c2ddb2266b8f243.zip | |
[SCSI] isci: stop interpreting ->lldd_lu_reset() as an ata soft-reset
Driving resets from libsas-eh is pre-mature as libata will make a
decision about performing a softreset. Currently libata determines
whether to perform a softreset based on ata_eh_followup_srst_needed(),
and none of those conditions apply to isci.
Remove the srst implementation and translate ->lldd_lu_reset() for ata
devices as a request to drive a reset via libata-eh.
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Signed-off-by: James Bottomley <JBottomley@Parallels.com>
Diffstat (limited to 'drivers/scsi/isci/request.h')
| -rw-r--r-- | drivers/scsi/isci/request.h | 9 |
1 files changed, 1 insertions, 8 deletions
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h index be38933dd6df..bcf2f37f23e1 100644 --- a/drivers/scsi/isci/request.h +++ b/drivers/scsi/isci/request.h @@ -211,10 +211,6 @@ enum sci_base_request_states { SCI_REQ_STP_NON_DATA_WAIT_H2D, SCI_REQ_STP_NON_DATA_WAIT_D2H, - SCI_REQ_STP_SOFT_RESET_WAIT_H2D_ASSERTED, - SCI_REQ_STP_SOFT_RESET_WAIT_H2D_DIAG, - SCI_REQ_STP_SOFT_RESET_WAIT_D2H, - /* * While in this state the IO request object is waiting for the TC * completion notification for the H2D Register FIS @@ -446,10 +442,7 @@ sci_task_request_construct(struct isci_host *ihost, struct isci_remote_device *idev, u16 io_tag, struct isci_request *ireq); -enum sci_status -sci_task_request_construct_ssp(struct isci_request *ireq); -enum sci_status -sci_task_request_construct_sata(struct isci_request *ireq); +enum sci_status sci_task_request_construct_ssp(struct isci_request *ireq); void sci_smp_request_copy_response(struct isci_request *ireq); static inline int isci_task_is_ncq_recovery(struct sas_task *task) |