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

Commit 8bc80d30 authored by Piotr Sawicki's avatar Piotr Sawicki Committed by Dan Williams
Browse files

isci: unify port stop handlers 



Implement the stop handlers directly in scic_sds_port_stop()

Reported-by: default avatarChristoph Hellwig <hch@lst.de>
Signed-off-by: default avatarPiotr Sawicki <piotr.sawicki@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d76f71d9

drivers/scsi/isci/host.c

+1 −3
Original line number Diff line number Diff line
@@ -1591,10 +1591,8 @@ static enum sci_status scic_sds_controller_stop_ports(struct scic_sds_controller 


	for (index = 0; index < scic->logical_port_entries; index++) {

		struct scic_sds_port *sci_port = &ihost->ports[index].sci;

		scic_sds_port_handler_t stop;



		stop = sci_port->state_handlers->stop_handler;

		port_status = stop(sci_port);

		port_status = scic_sds_port_stop(sci_port);



		if ((port_status != SCI_SUCCESS) &&

		    (port_status != SCI_FAILURE_INVALID_STATE)) {

drivers/scsi/isci/port.c

+22 −53
Original line number Diff line number Diff line
@@ -1178,17 +1178,6 @@ static void scic_port_enable_broadcast_change_notification(struct scic_sds_port 
 * *  READY SUBSTATE HANDLERS

 * **************************************************************************** */



/*

 * This method is the general ready state stop handler for the struct scic_sds_port

 * object.  This function will transition the ready substate machine to its

 * final state. enum sci_status SCI_SUCCESS

 */

static enum sci_status scic_sds_port_ready_substate_stop_handler(struct scic_sds_port *sci_port)

{

	port_state_machine_change(sci_port, SCI_BASE_PORT_STATE_STOPPING);

	return SCI_SUCCESS;

}



/*

 * This method is the general ready substate complete io handler for the

 * struct scic_sds_port object.  This function decrments the outstanding request count
@@ -1479,12 +1468,6 @@ static enum sci_status default_port_handler(struct scic_sds_port *sci_port, 
	return SCI_FAILURE_INVALID_STATE;

}



static enum sci_status

scic_sds_port_default_stop_handler(struct scic_sds_port *sci_port)

{

	return default_port_handler(sci_port, __func__);

}



static enum sci_status

scic_sds_port_default_destruct_handler(struct scic_sds_port *sci_port)

{
@@ -1847,18 +1830,6 @@ static enum sci_status scic_sds_port_general_complete_io_handler( 
	return SCI_SUCCESS;

}



/*

 * This method takes the struct scic_sds_port that is in a stopped state and handles a

 * stop request.  This function takes no action. enum sci_status SCI_SUCCESS the

 * stop request is successful as the struct scic_sds_port object is already stopped.

 */

static enum sci_status scic_sds_port_stopped_state_stop_handler(

	struct scic_sds_port *port)

{

	/* We are already stopped so there is nothing to do here */

	return SCI_SUCCESS;

}



/*

 * This method takes the struct scic_sds_port that is in a stopped state and handles

 * the destruct request.  The stopped state is the only state in which the
@@ -1960,22 +1931,6 @@ static enum sci_status scic_sds_port_stopping_state_complete_io_handler( 
 * *  RESETTING STATE HANDLERS

 * **************************************************************************** */



/**

 *

 * @port: This is the port object which is being requested to stop.

 *

 * This method will stop a failed port.  This causes a transition to the

 * stopping state. enum sci_status SCI_SUCCESS

 */

static enum sci_status scic_sds_port_reset_state_stop_handler(

	struct scic_sds_port *port)

{

	port_state_machine_change(port,

				  SCI_BASE_PORT_STATE_STOPPING);



	return SCI_SUCCESS;

}



/*

 * This method will transition a failed port to its ready state.  The port

 * failed because a hard reset request timed out but at some time later one or
@@ -2093,9 +2048,30 @@ enum sci_status scic_sds_port_start(struct scic_sds_port *sci_port) 
	return status;

}



enum sci_status scic_sds_port_stop(struct scic_sds_port *sci_port)

{

	enum scic_sds_port_states state;



	state = sci_port->state_machine.current_state_id;

	switch (state) {

	case SCI_BASE_PORT_STATE_STOPPED:

		return SCI_SUCCESS;

	case SCIC_SDS_PORT_READY_SUBSTATE_WAITING:

	case SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL:

	case SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING:

	case SCI_BASE_PORT_STATE_RESETTING:

		port_state_machine_change(sci_port,

					  SCI_BASE_PORT_STATE_STOPPING);

		return SCI_SUCCESS;

	default:

		dev_warn(sciport_to_dev(sci_port),

			 "%s: in wrong state: %d\n", __func__, state);

		return SCI_FAILURE_INVALID_STATE;

	}

}



static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = {

	[SCI_BASE_PORT_STATE_STOPPED] = {

		.stop_handler   	= scic_sds_port_stopped_state_stop_handler,

		.destruct_handler 	= scic_sds_port_stopped_state_destruct_handler,

		.reset_handler  	= scic_sds_port_default_reset_handler,

		.add_phy_handler 	= scic_sds_port_stopped_state_add_phy_handler,
@@ -2108,7 +2084,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler 	= scic_sds_port_default_complete_io_handler

	},

	[SCI_BASE_PORT_STATE_STOPPING] = {

		.stop_handler   	= scic_sds_port_default_stop_handler,

		.destruct_handler 	= scic_sds_port_default_destruct_handler,

		.reset_handler  	= scic_sds_port_default_reset_handler,

		.add_phy_handler 	= scic_sds_port_default_add_phy_handler,
@@ -2121,7 +2096,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler 	= scic_sds_port_stopping_state_complete_io_handler

	},

	[SCI_BASE_PORT_STATE_READY] = {

		.stop_handler    	= scic_sds_port_default_stop_handler,

		.destruct_handler 	= scic_sds_port_default_destruct_handler,

		.reset_handler   	= scic_sds_port_default_reset_handler,

		.add_phy_handler 	= scic_sds_port_default_add_phy_handler,
@@ -2134,7 +2108,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler 	= scic_sds_port_general_complete_io_handler

	},

	[SCIC_SDS_PORT_READY_SUBSTATE_WAITING] = {

		.stop_handler		= scic_sds_port_ready_substate_stop_handler,

		.destruct_handler	= scic_sds_port_default_destruct_handler,

		.reset_handler		= scic_sds_port_default_reset_handler,

		.add_phy_handler	= scic_sds_port_ready_substate_add_phy_handler,
@@ -2147,7 +2120,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler	= scic_sds_port_ready_substate_complete_io_handler,

	},

	[SCIC_SDS_PORT_READY_SUBSTATE_OPERATIONAL] = {

		.stop_handler		= scic_sds_port_ready_substate_stop_handler,

		.destruct_handler	= scic_sds_port_default_destruct_handler,

		.reset_handler		= scic_sds_port_ready_operational_substate_reset_handler,

		.add_phy_handler	= scic_sds_port_ready_substate_add_phy_handler,
@@ -2160,7 +2132,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler	= scic_sds_port_ready_substate_complete_io_handler,

	},

	[SCIC_SDS_PORT_READY_SUBSTATE_CONFIGURING] = {

		.stop_handler		= scic_sds_port_ready_substate_stop_handler,

		.destruct_handler	= scic_sds_port_default_destruct_handler,

		.reset_handler		= scic_sds_port_default_reset_handler,

		.add_phy_handler	= scic_sds_port_ready_configuring_substate_add_phy_handler,
@@ -2173,7 +2144,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler	= scic_sds_port_ready_configuring_substate_complete_io_handler

	},

	[SCI_BASE_PORT_STATE_RESETTING] = {

		.stop_handler		= scic_sds_port_reset_state_stop_handler,

		.destruct_handler	= scic_sds_port_default_destruct_handler,

		.reset_handler		= scic_sds_port_default_reset_handler,

		.add_phy_handler	= scic_sds_port_default_add_phy_handler,
@@ -2186,7 +2156,6 @@ static struct scic_sds_port_state_handler scic_sds_port_state_handler_table[] = 
		.complete_io_handler	= scic_sds_port_general_complete_io_handler

	},

	[SCI_BASE_PORT_STATE_FAILED] = {

		.stop_handler		= scic_sds_port_default_stop_handler,

		.destruct_handler	= scic_sds_port_default_destruct_handler,

		.reset_handler		= scic_sds_port_default_reset_handler,

		.add_phy_handler	= scic_sds_port_default_add_phy_handler,

drivers/scsi/isci/port.h

+1 −6
Original line number Diff line number Diff line
@@ -312,12 +312,6 @@ typedef enum sci_status (*scic_sds_port_io_request_handler_t)(struct scic_sds_po 
							      struct scic_sds_request *);



struct scic_sds_port_state_handler {

	/**

	 * The stop_handler specifies the method invoked when a user

	 * attempts to stop a port.

	 */

	scic_sds_port_handler_t stop_handler;



	/**

	 * The destruct_handler specifies the method invoked when attempting to

	 * destruct a port.
@@ -412,6 +406,7 @@ enum sci_status scic_sds_port_initialize( 
	void __iomem *viit_registers);



enum sci_status scic_sds_port_start(struct scic_sds_port *sci_port);

enum sci_status scic_sds_port_stop(struct scic_sds_port *sci_port);



enum sci_status scic_sds_port_add_phy(

	struct scic_sds_port *sci_port,