Commit 3ef768c6 authored by Jeff Skirvin's avatar Jeff Skirvin Committed by Dan Williams

isci: Manage the IREQ_NO_AUTO_FREE_TAG under scic_lock.

Since there is a possibilty of a timeout waiting for the RNC suspension,
handle the exit case from the task termination under scic_lock, and leave
the tag allocated if the termination timed-out.
Signed-off-by: default avatarJeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent f8381807
...@@ -243,8 +243,11 @@ enum sci_status isci_remote_device_terminate_requests( ...@@ -243,8 +243,11 @@ enum sci_status isci_remote_device_terminate_requests(
idev->rnc.destination_state, idev->rnc.destination_state,
ireq, ireq->flags); ireq, ireq->flags);
} }
spin_lock_irqsave(&ihost->scic_lock, flags);
clear_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags); clear_bit(IREQ_NO_AUTO_FREE_TAG, &ireq->flags);
isci_free_tag(ihost, ireq->io_tag); if (!test_bit(IREQ_ABORT_PATH_ACTIVE, &ireq->flags))
isci_free_tag(ihost, ireq->io_tag);
spin_unlock_irqrestore(&ihost->scic_lock, flags);
} else { } else {
/* Terminate all TCs. */ /* Terminate all TCs. */
sci_remote_device_terminate_requests(idev); sci_remote_device_terminate_requests(idev);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment