diff options
| author | Jeff Skirvin <jeffrey.d.skirvin@intel.com> | 2012-03-08 22:42:03 -0800 |
|---|---|---|
| committer | Dan Williams <dan.j.williams@intel.com> | 2012-05-17 14:33:41 -0700 |
| commit | 033d19d298b4245da2d3d6c795ea97e419f9ac61 (patch) | |
| tree | 2e66627f294b9e2b52174e719ff987464cedaeec /drivers/scsi/isci/host.c | |
| parent | 0c3ce38f1bc8b6a6d8df0959e3c0dece31f9350c (diff) | |
isci: Callbacks to libsas occur under scic_lock and are synchronized.
This patch changes the callback mechanism to libsas to only occur while
the scic_lock is held; the abort path cleanup of I/Os also checks to make
sure IREQ_ABORT_PATH_ACTIVE is clear before proceding.
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/host.c')
| -rw-r--r-- | drivers/scsi/isci/host.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/drivers/scsi/isci/host.c b/drivers/scsi/isci/host.c index 25d537e2f5c..53c3ad64c99 100644 --- a/drivers/scsi/isci/host.c +++ b/drivers/scsi/isci/host.c @@ -1105,8 +1105,6 @@ void isci_host_completion_routine(unsigned long data) list_splice_init(&ihost->requests_to_complete, &completed_request_list); - spin_unlock_irq(&ihost->scic_lock); - /* Process any completions in the list. */ list_for_each_safe(current_position, next_position, &completed_request_list) { @@ -1115,7 +1113,6 @@ void isci_host_completion_routine(unsigned long data) completed_node); task = isci_request_access_task(request); - /* Return the task to libsas */ if (task != NULL) { @@ -1141,11 +1138,12 @@ void isci_host_completion_routine(unsigned long data) } } } + if (test_and_clear_bit(IREQ_ABORT_PATH_ACTIVE, &request->flags)) + wake_up_all(&ihost->eventq); - spin_lock_irq(&ihost->scic_lock); isci_free_tag(ihost, request->io_tag); - spin_unlock_irq(&ihost->scic_lock); } + spin_unlock_irq(&ihost->scic_lock); /* the coalesence timeout doubles at each encoding step, so * update it based on the ilog2 value of the outstanding requests @@ -2703,8 +2701,6 @@ enum sci_status sci_controller_complete_io(struct isci_host *ihost, index = ISCI_TAG_TCI(ireq->io_tag); clear_bit(IREQ_ACTIVE, &ireq->flags); - if (test_bit(IREQ_ABORT_PATH_ACTIVE, &ireq->flags)) - wake_up_all(&ihost->eventq); return SCI_SUCCESS; default: dev_warn(&ihost->pdev->dev, "%s invalid state: %d\n", |