aboutsummaryrefslogtreecommitdiff
path: root/drivers/scsi/isci
diff options
context:
space:
mode:
authorJeff Skirvin <jeffrey.d.skirvin@intel.com>2012-03-08 22:42:03 -0800
committerDan Williams <dan.j.williams@intel.com>2012-05-17 14:33:41 -0700
commit621120ca56850249554996c94efe75f8200a2cc0 (patch)
tree892326cd79b25e0741ee271c01cc04aadb1af8ef /drivers/scsi/isci
parent033d19d298b4245da2d3d6c795ea97e419f9ac61 (diff)
downloadlinux-linaro-stable-621120ca56850249554996c94efe75f8200a2cc0.tar.gz
isci: Manage tag releases differently when aborting tasks.
When an individual request is being terminated, the request's tag is managed in the terminate function. 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/host.c3
-rw-r--r--drivers/scsi/isci/remote_device.c11
-rw-r--r--drivers/scsi/isci/request.h1
-rw-r--r--drivers/scsi/isci/task.c3
4 files changed, 12 insertions, 6 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c
index 53c3ad64c998..ef2790faeab8 100644
--- a/drivers/scsi/isci/host.c
+++ b/drivers/scsi/isci/host.c
@@ -1141,7 +1141,8 @@ void isci_host_completion_routine(unsigned long data)
if (test_and_clear_bit(IREQ_ABORT_PATH_ACTIVE, &request->flags))
wake_up_all(&ihost->eventq);
- isci_free_tag(ihost, request->io_tag);
+ if (!test_bit(IREQ_NO_AUTO_FREE_TAG, &request->flags))
+ isci_free_tag(ihost, request->io_tag);
}
spin_unlock_irq(&ihost->scic_lock);
diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index 21a9800a9bec..adeda64e512a 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -104,15 +104,15 @@ static enum sci_status sci_remote_device_terminate_req(
int check_abort,
struct isci_request *ireq)
{
- dev_dbg(&ihost->pdev->dev,
- "%s: idev=%p; flags=%lx; req=%p; req target=%p\n",
- __func__, idev, idev->flags, ireq, ireq->target_device);
-
if (!test_bit(IREQ_ACTIVE, &ireq->flags) ||
(ireq->target_device != idev) ||
(check_abort && !test_bit(IREQ_PENDING_ABORT, &ireq->flags)))
return SCI_SUCCESS;
+ dev_dbg(&ihost->pdev->dev,
+ "%s: idev=%p; flags=%lx; req=%p; req target=%p\n",
+ __func__, idev, idev->flags, ireq, ireq->target_device);
+
set_bit(IREQ_ABORT_PATH_ACTIVE, &ireq->flags);
return sci_controller_terminate_request(ihost, idev, ireq);
@@ -209,11 +209,14 @@ enum sci_status isci_remote_device_terminate_requests(
rnc_suspend_count, idev->rnc.suspend_count);
if (ireq) {
/* Terminate a specific TC. */
+ set_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags);
sci_remote_device_terminate_req(ihost, idev, 0, ireq);
spin_unlock_irqrestore(&ihost->scic_lock, flags);
wait_event(ihost->eventq,
isci_check_reqterm(ihost, idev, ireq,
rnc_suspend_count));
+ clear_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags);
+ isci_free_tag(ihost, ireq->io_tag);
} else {
/* Terminate all TCs. */
sci_remote_device_terminate_requests(idev);
diff --git a/drivers/scsi/isci/request.h b/drivers/scsi/isci/request.h
index d12e97531da8..1a651579bb33 100644
--- a/drivers/scsi/isci/request.h
+++ b/drivers/scsi/isci/request.h
@@ -87,6 +87,7 @@ struct isci_request {
#define IREQ_PENDING_ABORT 4 /* Set == device was not suspended yet */
#define IREQ_TC_ABORT_POSTED 5
#define IREQ_ABORT_PATH_ACTIVE 6
+ #define IREQ_NO_AUTO_FREE_TAG 7 /* Set when being explicitly managed */
unsigned long flags;
/* XXX kill ttype and ttype_ptr, allocate full sas_task */
union ttype_ptr_union {
diff --git a/drivers/scsi/isci/task.c b/drivers/scsi/isci/task.c
index c1c6dd0473ae..e798c6ae9592 100644
--- a/drivers/scsi/isci/task.c
+++ b/drivers/scsi/isci/task.c
@@ -719,7 +719,8 @@ isci_task_request_complete(struct isci_host *ihost,
*/
set_bit(IREQ_TERMINATED, &ireq->flags);
- isci_free_tag(ihost, ireq->io_tag);
+ if (!test_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags))
+ isci_free_tag(ihost, ireq->io_tag);
/* The task management part completes last. */
if (tmf_complete)