isci: Save the suspension hint for upcoming suspensions.

In the case of a suspend call while in SCI_RNC_POSTING or INVALIDATING
states, the LLHANG detect needed to be saved so the upcoming suspension
would enable it correctly.  The unused suspend callback parameters were
removed.

Signed-off-by: Jeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: Dan Williams <dan.j.williams@intel.com>

4 files changed, 12 insertions, 18 deletions

diff --git a/drivers/scsi/isci/remote_device.c b/drivers/scsi/isci/remote_device.c
index cc8ab69a2022..1a85e9edef6a 100644
--- a/drivers/scsi/isci/remote_device.c
+++ b/drivers/scsi/isci/remote_device.c
@@ -75,10 +75,8 @@ const char *dev_state_name(enum sci_remote_device_states state)
 static enum sci_status sci_remote_device_suspend(struct isci_remote_device *idev,
                                                  enum sci_remote_node_suspension_reasons reason)
 {
-        return sci_remote_node_context_suspend(&idev->rnc,
-                                               reason,
-                                               SCI_SOFTWARE_SUSPEND_EXPECTED_EVENT,
-                                               NULL, NULL);
+        return sci_remote_node_context_suspend(&idev->rnc, reason,
+                                               SCI_SOFTWARE_SUSPEND_EXPECTED_EVENT);
 }
 
 /**
diff --git a/drivers/scsi/isci/remote_node_context.c b/drivers/scsi/isci/remote_node_context.c
index 85bf5ec26417..2ac92608cc2d 100644
--- a/drivers/scsi/isci/remote_node_context.c
+++ b/drivers/scsi/isci/remote_node_context.c
@@ -315,8 +315,8 @@ static void sci_remote_node_context_ready_state_enter(struct sci_base_state_mach
         if ((dest_select == RNC_DEST_SUSPENDED) ||
             (dest_select == RNC_DEST_SUSPENDED_RESUME)) {
                 sci_remote_node_context_suspend(
-                        rnc, SCI_SW_SUSPEND_NORMAL,
-                        SCI_SOFTWARE_SUSPEND_EXPECTED_EVENT, NULL, NULL);
+                        rnc, rnc->suspend_reason,
+                        SCI_SOFTWARE_SUSPEND_EXPECTED_EVENT);
 
                 if (dest_select == RNC_DEST_SUSPENDED_RESUME) {
                         sci_remote_node_context_resume(rnc, usr_cb, usr_param);
@@ -539,9 +539,7 @@ enum sci_status sci_remote_node_context_destruct(struct sci_remote_node_context
 enum sci_status sci_remote_node_context_suspend(
                         struct sci_remote_node_context *sci_rnc,
                         enum sci_remote_node_suspension_reasons suspend_reason,
-                        u32 suspend_type,
-                        scics_sds_remote_node_context_callback cb_fn,
-                        void *cb_p)
+                        u32 suspend_type)
 {
         enum scis_sds_remote_node_context_states state
                 = sci_rnc->sm.current_state_id;
@@ -581,6 +579,8 @@ enum sci_status sci_remote_node_context_suspend(
                  * needs to be done immediately.
                  */
                 sci_rnc->destination_state = RNC_DEST_SUSPENDED;
+                sci_rnc->suspend_type = suspend_type;
+                sci_rnc->suspend_reason = suspend_reason;
                 return SCI_SUCCESS;
 
         case SCI_RNC_TX_SUSPENDED:
@@ -603,14 +603,12 @@ enum sci_status sci_remote_node_context_suspend(
                 return SCI_FAILURE_INVALID_STATE;
         }
         sci_rnc->destination_state = dest_param;
-        sci_rnc->user_callback = cb_fn;
-        sci_rnc->user_cookie   = cb_p;
-        sci_rnc->suspend_type  = suspend_type;
+        sci_rnc->suspend_type = suspend_type;
+        sci_rnc->suspend_reason = suspend_reason;
 
         if (status == SCI_SUCCESS) { /* Already in the destination state? */
                 struct isci_host *ihost = idev->owning_port->owning_controller;
 
-                sci_remote_node_context_notify_user(sci_rnc);
                 wake_up_all(&ihost->eventq); /* Let observers look. */
                 return SCI_SUCCESS;
         }
diff --git a/drivers/scsi/isci/remote_node_context.h b/drivers/scsi/isci/remote_node_context.h
index 364da3722aa4..9eee304fdf9a 100644
--- a/drivers/scsi/isci/remote_node_context.h
+++ b/drivers/scsi/isci/remote_node_context.h
@@ -169,6 +169,7 @@ struct sci_remote_node_context {
          * context suspension.
          */
         u32 suspend_type;
+        enum sci_remote_node_suspension_reasons suspend_reason;
 
         /**
          * This field is true if the remote node context is resuming from its current
@@ -209,9 +210,7 @@ enum sci_status sci_remote_node_context_destruct(struct sci_remote_node_context
                                                       void *callback_parameter);
 enum sci_status sci_remote_node_context_suspend(struct sci_remote_node_context *sci_rnc,
                                                      u32 suspend_type,
-                                                     u32 suspension_code,
-                                                     scics_sds_remote_node_context_callback cb_fn,
-                                                     void *cb_p);
+                                                     u32 suspension_code);
 enum sci_status sci_remote_node_context_resume(struct sci_remote_node_context *sci_rnc,
                                                     scics_sds_remote_node_context_callback cb_fn,
                                                     void *cb_p);
diff --git a/drivers/scsi/isci/request.c b/drivers/scsi/isci/request.c
index 809d3683d0c9..432585b04dc2 100644
--- a/drivers/scsi/isci/request.c
+++ b/drivers/scsi/isci/request.c
@@ -2382,8 +2382,7 @@ static void sci_request_handle_suspending_completions(
                         &ireq->target_device->rnc,
                         SCI_HW_SUSPEND,
                         (is_tx_rx) ? SCU_EVENT_TL_RNC_SUSPEND_TX_RX
-                                   : SCU_EVENT_TL_RNC_SUSPEND_TX,
-                        NULL, NULL);
+                                   : SCU_EVENT_TL_RNC_SUSPEND_TX);
         }
 }