From 55af09c623a32a0d8b07ad9ebd27238562d56ccb Mon Sep 17 00:00:00 2001 From: Jeff Skirvin Date: Thu, 8 Mar 2012 22:41:49 -0800 Subject: [PATCH] --- yaml --- r: 302551 b: refs/heads/master c: 56d7c013e714c6feab2ab5ac854808e29048b069 h: refs/heads/master i: 302549: aa180761c25f925eda2cf334c72fcc1230dfd1e3 302547: 95965706302d0079f627f3a88d4abfb305951fae 302543: ae20cf8a101cf3906d739f7853546b4f8f9c0598 v: v3 --- [refs] | 2 +- trunk/drivers/scsi/isci/remote_node_context.c | 12 +++++++----- 2 files changed, 8 insertions(+), 6 deletions(-) diff --git a/[refs] b/[refs] index 2717a7079b70..a4fd1093d566 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 6f48844e3f16b7d8a1f9a1a11bd9a11089a5292f +refs/heads/master: 56d7c013e714c6feab2ab5ac854808e29048b069 diff --git a/trunk/drivers/scsi/isci/remote_node_context.c b/trunk/drivers/scsi/isci/remote_node_context.c index 3a55ba66b8ac..3e849752bffa 100644 --- a/trunk/drivers/scsi/isci/remote_node_context.c +++ b/trunk/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;