diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2012-03-08 22:41:52 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 14:33:37 -0700 |
| commit | 23ec2aa947e83d0a172220f361166b8224875221 (patch) | |
| tree | 747e299efb5c534d99bc84b9631dedec02b033aa /drivers/scsi/isci | |
| parent | 5b6bf225e7fc249c703e19bf2c983d1a59178874 (diff) | |
| download | linux-3.10-23ec2aa947e83d0a172220f361166b8224875221.tar.gz linux-3.10-23ec2aa947e83d0a172220f361166b8224875221.tar.bz2 linux-3.10-23ec2aa947e83d0a172220f361166b8224875221.zip | |
isci: Remote device must be suspended for NCQ cleanup.
When the remote device enters the NCQ error state, the device must
be suspended so that the I/O terminations can take place.
Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>
Diffstat (limited to 'drivers/scsi/isci')
| -rw-r--r-- | drivers/scsi/isci/remote_device.c | 25 |
1 files changed, 12 insertions, 13 deletions
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c index 4f76dcd1cec..f40d429d2cc 100644 --- a/drivers/scsi/isci/remote_device.c +++ b/drivers/scsi/isci/remote_device.c @@ -72,6 +72,14 @@ const char *dev_state_name(enum sci_remote_device_states state) } #undef C +static enum sci_status sci_remote_device_suspend(struct isci_remote_device *idev) +{ + return sci_remote_node_context_suspend(&idev->rnc, + SCI_SOFTWARE_SUSPENSION, + SCI_SOFTWARE_SUSPEND_EXPECTED_EVENT, + NULL, NULL); +} + /** * isci_remote_device_not_ready() - This function is called by the ihost when * the remote device is not ready. We mark the isci device as ready (not @@ -96,6 +104,9 @@ static void isci_remote_device_not_ready(struct isci_host *ihost, case SCIC_REMOTE_DEVICE_NOT_READY_SATA_SDB_ERROR_FIS_RECEIVED: set_bit(IDEV_IO_NCQERROR, &idev->flags); + /* Suspend the remote device so the I/O can be terminated. */ + sci_remote_device_suspend(idev); + /* Kill all outstanding requests for the device. */ list_for_each_entry(ireq, &idev->reqs_in_process, dev_node) { @@ -103,9 +114,7 @@ static void isci_remote_device_not_ready(struct isci_host *ihost, "%s: isci_device = %p request = %p\n", __func__, idev, ireq); - sci_controller_terminate_request(ihost, - idev, - ireq); + sci_controller_terminate_request(ihost, idev, ireq); } /* Fall through into the default case... */ default: @@ -133,16 +142,6 @@ static void isci_remote_device_ready(struct isci_host *ihost, struct isci_remote wake_up(&ihost->eventq); } -static enum sci_status sci_remote_device_suspend( - struct isci_remote_device *idev) -{ - return sci_remote_node_context_suspend( - &idev->rnc, - SCI_SOFTWARE_SUSPENSION, - SCI_SOFTWARE_SUSPEND_EXPECTED_EVENT, - NULL, NULL); -} - static int isci_remote_device_suspendcheck(struct isci_remote_device *idev) { return test_bit(IDEV_TXRX_SUSPENDED, &idev->flags) |