Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 447bfbce authored by Jeff Skirvin's avatar Jeff Skirvin Committed by Dan Williams
Browse files

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: default avatarJeff Skirvin <jeffrey.d.skirvin@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent e3c84dfd

drivers/scsi/isci/remote_device.c

+2 −4
Original line number Diff line number Diff line
@@ -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);

}



/**

drivers/scsi/isci/remote_node_context.c

+7 −9
Original line number Diff line number Diff line
@@ -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_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;

	}

drivers/scsi/isci/remote_node_context.h

+2 −3
Original line number Diff line number Diff line
@@ -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);

drivers/scsi/isci/request.c

+1 −2
Original line number Diff line number Diff line
@@ -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);

	}

}