diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2012-03-08 22:41:49 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 14:33:36 -0700 |
| commit | 56d7c013e714c6feab2ab5ac854808e29048b069 (patch) | |
| tree | da627f1e8d49fe6d2350123b31f418e572f15ad0 /drivers/scsi | |
| parent | 6f48844e3f16b7d8a1f9a1a11bd9a11089a5292f (diff) | |
| download | linux-56d7c013e714c6feab2ab5ac854808e29048b069.tar.bz2 | |
isci: Fixed bug in resumption from RNC Tx/Rx suspend state.
The resumption from the Tx/Rx suspended state should work the same
as the Tx suspended state.
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')
| -rw-r--r-- | drivers/scsi/isci/remote_node_context.c | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/drivers/scsi/isci/remote_node_context.c b/drivers/scsi/isci/remote_node_context.c index 3a55ba66b8ac..3e849752bffa 100644 --- a/drivers/scsi/isci/remote_node_context.c +++ b/drivers/scsi/isci/remote_node_context.c @@ -557,10 +557,16 @@ enum sci_status sci_remote_node_context_resume(struct sci_remote_node_context *s sci_rnc->user_callback = cb_fn; sci_rnc->user_cookie = cb_p; return SCI_SUCCESS; - case SCI_RNC_TX_SUSPENDED: { + case SCI_RNC_TX_SUSPENDED: + case SCI_RNC_TX_RX_SUSPENDED: { struct isci_remote_device *idev = rnc_to_dev(sci_rnc); struct domain_device *dev = idev->domain_dev; + /* If this is an expander attached SATA device we must + * invalidate and repost the RNC since this is the only way + * to clear the TCi to NCQ tag mapping table for the RNi. + * All other device types we can just resume. + */ sci_remote_node_context_setup_to_resume(sci_rnc, cb_fn, cb_p); if (dev_is_sata(dev) && dev->parent) @@ -569,10 +575,6 @@ enum sci_status sci_remote_node_context_resume(struct sci_remote_node_context *s sci_change_state(&sci_rnc->sm, SCI_RNC_RESUMING); return SCI_SUCCESS; } - case SCI_RNC_TX_RX_SUSPENDED: - sci_remote_node_context_setup_to_resume(sci_rnc, cb_fn, cb_p); - sci_change_state(&sci_rnc->sm, SCI_RNC_RESUMING); - return SCI_FAILURE_INVALID_STATE; case SCI_RNC_AWAIT_SUSPENSION: sci_remote_node_context_setup_to_resume(sci_rnc, cb_fn, cb_p); return SCI_SUCCESS; |