From de2eb4d5c5c25e8fb75d1e19092f24b83cb7d8d5 Mon Sep 17 00:00:00 2001 From: Jeff Skirvin Date: Tue, 13 Mar 2012 17:15:11 -0700 Subject: isci: End the RNC resumption wait when the RNC is destroyed. While the RNC is suspended for I/O cleanup, the remote device can be stopped and the RNC setup for destruction. These changes accomodate that case in the abort path. Signed-off-by: Jeff Skirvin Signed-off-by: Dan Williams --- drivers/scsi/isci/host.h | 5 +++++ drivers/scsi/isci/remote_device.c | 29 +++++++++++++++++++++-------- drivers/scsi/isci/remote_node_context.c | 4 ++++ drivers/scsi/isci/remote_node_context.h | 6 +++--- 4 files changed, 33 insertions(+), 11 deletions(-) (limited to 'drivers/scsi/isci') diff --git a/drivers/scsi/isci/host.h b/drivers/scsi/isci/host.h index 8e8b46322c64..9ab58e0540e7 100644 --- a/drivers/scsi/isci/host.h +++ b/drivers/scsi/isci/host.h @@ -340,6 +340,11 @@ static inline struct isci_host *dev_to_ihost(struct domain_device *dev) return dev->port->ha->lldd_ha; } +static inline struct isci_host *idev_to_ihost(struct isci_remote_device *idev) +{ + return dev_to_ihost(idev->domain_dev); +} + /* we always use protocol engine group zero */ #define ISCI_PEG 0 diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c index a3a6487264ea..c3aa6c5457b9 100644 --- a/drivers/scsi/isci/remote_device.c +++ b/drivers/scsi/isci/remote_device.c @@ -1368,27 +1368,40 @@ static void isci_remote_device_resume_from_abort_complete(void *cbparam) wake_up(&ihost->eventq); } +static bool isci_remote_device_test_resume_done( + struct isci_host *ihost, + struct isci_remote_device *idev) +{ + unsigned long flags; + bool done; + + spin_lock_irqsave(&ihost->scic_lock, flags); + done = !test_bit(IDEV_ABORT_PATH_RESUME_PENDING, &idev->flags) + || test_bit(IDEV_STOP_PENDING, &idev->flags) + || sci_remote_node_context_is_being_destroyed(&idev->rnc); + spin_unlock_irqrestore(&ihost->scic_lock, flags); + + return done; +} void isci_remote_device_wait_for_resume_from_abort( struct isci_host *ihost, struct isci_remote_device *idev) { - dev_dbg(scirdev_to_dev(idev), "%s: starting resume wait: %p\n", + dev_dbg(&ihost->pdev->dev, "%s: starting resume wait: %p\n", __func__, idev); #define MAX_RESUME_MSECS 10000 if (!wait_event_timeout(ihost->eventq, - (!test_bit(IDEV_ABORT_PATH_RESUME_PENDING, - &idev->flags) - || test_bit(IDEV_STOP_PENDING, &idev->flags)), - msecs_to_jiffies(MAX_RESUME_MSECS))) { + isci_remote_device_test_resume_done(ihost, idev), + msecs_to_jiffies(MAX_RESUME_MSECS))) { - dev_warn(scirdev_to_dev(idev), "%s: #### Timeout waiting for " + dev_warn(&ihost->pdev->dev, "%s: #### Timeout waiting for " "resume: %p\n", __func__, idev); } clear_bit(IDEV_ABORT_PATH_RESUME_PENDING, &idev->flags); - dev_dbg(scirdev_to_dev(idev), "%s: resume wait done: %p\n", + dev_dbg(&ihost->pdev->dev, "%s: resume wait done: %p\n", __func__, idev); } @@ -1414,7 +1427,7 @@ enum sci_status isci_remote_device_resume_from_abort( idev, isci_remote_device_resume_from_abort_complete, idev); spin_unlock_irqrestore(&ihost->scic_lock, flags); - if (!destroyed) + if (!destroyed && (status == SCI_SUCCESS)) isci_remote_device_wait_for_resume_from_abort(ihost, idev); else clear_bit(IDEV_ABORT_PATH_RESUME_PENDING, &idev->flags); diff --git a/drivers/scsi/isci/remote_node_context.c b/drivers/scsi/isci/remote_node_context.c index f5792a901e02..1910100638a2 100644 --- a/drivers/scsi/isci/remote_node_context.c +++ b/drivers/scsi/isci/remote_node_context.c @@ -190,9 +190,13 @@ static void sci_remote_node_context_setup_to_destroy( scics_sds_remote_node_context_callback callback, void *callback_parameter) { + struct isci_host *ihost = idev_to_ihost(rnc_to_dev(sci_rnc)); + sci_rnc->destination_state = RNC_DEST_FINAL; sci_rnc->user_callback = callback; sci_rnc->user_cookie = callback_parameter; + + wake_up(&ihost->eventq); } /** diff --git a/drivers/scsi/isci/remote_node_context.h b/drivers/scsi/isci/remote_node_context.h index 0d4a24d647b4..a703b9ce0c2c 100644 --- a/drivers/scsi/isci/remote_node_context.h +++ b/drivers/scsi/isci/remote_node_context.h @@ -229,8 +229,8 @@ int sci_remote_node_context_is_safe_to_abort( static inline bool sci_remote_node_context_is_being_destroyed( struct sci_remote_node_context *sci_rnc) { - return ((sci_rnc->sm.current_state_id == SCI_RNC_INVALIDATING) - && (sci_rnc->destination_state == RNC_DEST_FINAL)) - || (sci_rnc->sm.current_state_id == SCI_RNC_INITIAL); + return (sci_rnc->destination_state == RNC_DEST_FINAL) + || ((sci_rnc->sm.current_state_id == SCI_RNC_INITIAL) + && (sci_rnc->destination_state == RNC_DEST_UNSPECIFIED)); } #endif /* _SCIC_SDS_REMOTE_NODE_CONTEXT_H_ */ -- cgit v1.2.3