diff options
author | Dan Williams <dan.j.williams@intel.com> | 2012-02-23 04:12:10 -0500 |
---|---|---|
committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 15:27:12 -0400 |
commit | eb608c3cb3f0a6b99252ea6a69fc0d2bbecf1f4f (patch) | |
tree | e28da3a8a530798c7c3368d16f88003ee3ee0643 /drivers/scsi/isci/host.h | |
parent | abec912d71c44bbd642ce12ad98aab76f5a53163 (diff) |
isci: fix controller stop
1/ notify waiters when controller stop completes (fixes 10 second stall
unloading the driver)
2/ make sure phy stop is after port and device stop
Cc: Richard Boyd <richard.g.boyd@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci/host.h')
-rw-r--r-- | drivers/scsi/isci/host.h | 8 |
1 files changed, 1 insertions, 7 deletions
diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index 4695162f406e..a89c0e3c5a14 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h | |||
@@ -277,13 +277,6 @@ enum sci_controller_states { | |||
277 | SCIC_STOPPING, | 277 | SCIC_STOPPING, |
278 | 278 | ||
279 | /** | 279 | /** |
280 | * This state indicates that the controller has successfully been stopped. | ||
281 | * In this state no new IO operations are permitted. | ||
282 | * This state is entered from the STOPPING state. | ||
283 | */ | ||
284 | SCIC_STOPPED, | ||
285 | |||
286 | /** | ||
287 | * This state indicates that the controller could not successfully be | 280 | * This state indicates that the controller could not successfully be |
288 | * initialized. In this state no new IO operations are permitted. | 281 | * initialized. In this state no new IO operations are permitted. |
289 | * This state is entered from the INITIALIZING state. | 282 | * This state is entered from the INITIALIZING state. |
@@ -479,6 +472,7 @@ int isci_host_init(struct isci_host *); | |||
479 | void isci_host_completion_routine(unsigned long data); | 472 | void isci_host_completion_routine(unsigned long data); |
480 | void isci_host_deinit(struct isci_host *); | 473 | void isci_host_deinit(struct isci_host *); |
481 | void sci_controller_disable_interrupts(struct isci_host *ihost); | 474 | void sci_controller_disable_interrupts(struct isci_host *ihost); |
475 | bool sci_controller_has_remote_devices_stopping(struct isci_host *ihost); | ||
482 | 476 | ||
483 | enum sci_status sci_controller_start_io( | 477 | enum sci_status sci_controller_start_io( |
484 | struct isci_host *ihost, | 478 | struct isci_host *ihost, |