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

Commit d3757c3a authored by Maciej Patelczyk's avatar Maciej Patelczyk Committed by Dan Williams
Browse files

isci: Removed sci_base_object from scic_sds_controller. 



The 'struct sci_base_object' was removed from the struct
scic_sds_controller and was replaced by a pointer to
struct isci_host.

Signed-off-by: default avatarMaciej Patelczyk <maciej.patelczyk@intel.com>
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent 9a0fff7b

drivers/scsi/isci/core/scic_sds_controller.c

+17 −27
Original line number Diff line number Diff line
@@ -213,7 +213,7 @@ static void scic_sds_controller_power_control_timer_handler( 


static void scic_sds_controller_initialize_power_control(struct scic_sds_controller *scic)

{

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	scic->power_control.timer = isci_timer_create(ihost,

						      scic,

					scic_sds_controller_power_control_timer_handler);
@@ -584,7 +584,7 @@ static void scic_sds_controller_transition_to_ready( 
	struct scic_sds_controller *scic,

	enum sci_status status)

{

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	if (scic->state_machine.current_state_id ==

	    SCI_BASE_CONTROLLER_STATE_STARTING) {
@@ -602,7 +602,7 @@ static void scic_sds_controller_transition_to_ready( 
static void scic_sds_controller_timeout_handler(void *_scic)

{

	struct scic_sds_controller *scic = _scic;

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	struct sci_base_state_machine *sm = &scic->state_machine;



	if (sm->current_state_id == SCI_BASE_CONTROLLER_STATE_STARTING)
@@ -770,7 +770,7 @@ static void scic_sds_controller_phy_startup_timeout_handler(void *_scic) 


static enum sci_status scic_sds_controller_initialize_phy_startup(struct scic_sds_controller *scic)

{

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	scic->phy_startup_timer = isci_timer_create(ihost,

						    scic,
@@ -1796,7 +1796,7 @@ void scic_sds_controller_release_frame( 
 */

static void scic_sds_controller_set_default_config_parameters(struct scic_sds_controller *scic)

{

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	u16 index;



	/* Default to APC mode. */
@@ -2662,7 +2662,7 @@ enum sci_status scic_controller_initialize( 
	}





	ihost = sci_object_get_association(scic);

	ihost = scic->ihost;



	sci_base_state_machine_change_state(sm, SCI_BASE_CONTROLLER_STATE_INITIALIZING);
@@ -2854,7 +2854,7 @@ enum sci_status scic_controller_start(struct scic_sds_controller *scic, 
	/* Assign all the task entries to scic physical function */

	scic_sds_controller_assign_task_entries(scic);



	/* Now initialze the completion queue */

	/* Now initialize the completion queue */

	scic_sds_controller_initialize_completion_queue(scic);



	/* Initialize the unsolicited frame queue for use */
@@ -2887,14 +2887,12 @@ enum sci_status scic_controller_start(struct scic_sds_controller *scic, 
 *

 * This method implements the actions taken by the struct scic_sds_controller on entry

 * to the SCI_BASE_CONTROLLER_STATE_INITIAL. - Set the state handlers to the

 * controllers initial state. none This function should initialze the

 * controllers initial state. none This function should initialize the

 * controller object.

 */

static void scic_sds_controller_initial_state_enter(void *object)

{

	struct scic_sds_controller *scic;



	scic = (struct scic_sds_controller *)object;

	struct scic_sds_controller *scic = object;



	sci_base_state_machine_change_state(&scic->state_machine,

			SCI_BASE_CONTROLLER_STATE_RESET);
@@ -2911,7 +2909,7 @@ static void scic_sds_controller_initial_state_enter(void *object) 
 */

static inline void scic_sds_controller_starting_state_exit(void *object)

{

	struct scic_sds_controller *scic = (struct scic_sds_controller *)object;

	struct scic_sds_controller *scic = object;



	isci_timer_stop(scic->timeout_timer);

}
@@ -2927,9 +2925,7 @@ static inline void scic_sds_controller_starting_state_exit(void *object) 
 */

static void scic_sds_controller_ready_state_enter(void *object)

{

	struct scic_sds_controller *scic;



	scic = (struct scic_sds_controller *)object;

	struct scic_sds_controller *scic = object;



	/* set the default interrupt coalescence number and timeout value. */

	scic_controller_set_interrupt_coalescence(
@@ -2946,9 +2942,7 @@ static void scic_sds_controller_ready_state_enter(void *object) 
 */

static void scic_sds_controller_ready_state_exit(void *object)

{

	struct scic_sds_controller *scic;



	scic = (struct scic_sds_controller *)object;

	struct scic_sds_controller *scic = object;



	/* disable interrupt coalescence. */

	scic_controller_set_interrupt_coalescence(scic, 0, 0);
@@ -2966,9 +2960,7 @@ static void scic_sds_controller_ready_state_exit(void *object) 
 */

static void scic_sds_controller_stopping_state_enter(void *object)

{

	struct scic_sds_controller *scic;



	scic = (struct scic_sds_controller *)object;

	struct scic_sds_controller *scic = object;



	/* Stop all of the components for this controller */

	scic_sds_controller_stop_phys(scic);
@@ -2981,23 +2973,21 @@ static void scic_sds_controller_stopping_state_enter(void *object) 
 * @object: This is the object which is cast to a struct

 * scic_sds_controller object.

 *

 * This funciton implements the actions taken by the struct scic_sds_controller

 * This function implements the actions taken by the struct scic_sds_controller

 * on exit from the SCI_BASE_CONTROLLER_STATE_STOPPING. -

 * This function stops the controller stopping timeout timer.

 */

static inline void scic_sds_controller_stopping_state_exit(void *object)

{

	struct scic_sds_controller *scic =

		(struct scic_sds_controller *)object;

	struct scic_sds_controller *scic = object;



	isci_timer_stop(scic->timeout_timer);

}



static void scic_sds_controller_resetting_state_enter(void *object)

{

	struct scic_sds_controller *scic;

	struct scic_sds_controller *scic = object;



	scic = container_of(object, typeof(*scic), parent);

	scic_sds_controller_reset_hardware(scic);

	sci_base_state_machine_change_state(&scic->state_machine,

					    SCI_BASE_CONTROLLER_STATE_RESET);
@@ -3051,7 +3041,7 @@ enum sci_status scic_controller_construct(struct scic_sds_controller *scic, 
	u8 i;



	sci_base_state_machine_construct(&scic->state_machine,

		&scic->parent, scic_sds_controller_state_table,

		scic, scic_sds_controller_state_table,

		SCI_BASE_CONTROLLER_STATE_INITIAL);



	sci_base_state_machine_start(&scic->state_machine);

drivers/scsi/isci/core/scic_sds_controller.h

+4 −4
Original line number Diff line number Diff line
@@ -125,17 +125,17 @@ struct scic_power_control { 


};



struct isci_host;

/**

 * struct scic_sds_controller -

 *

 * This structure represents the SCU contoller object.

 * This structure represents the SCU controller object.

 */

struct scic_sds_controller {

	/**

	 * The field specifies that the parent object for the base controller

	 * is the base object itself.

	 * The field specifies that the peer object for the controller.

	 */

	struct sci_base_object parent;

	struct isci_host *ihost;



	/**

	 * This field contains the information for the base controller state

drivers/scsi/isci/core/scic_sds_phy.c

+3 −3
Original line number Diff line number Diff line
@@ -336,7 +336,7 @@ enum sci_status scic_sds_phy_initialize( 
	struct scu_link_layer_registers __iomem *link_layer_registers)

{

	struct scic_sds_controller *scic = scic_sds_phy_get_controller(sci_phy);

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	/* Create the SIGNATURE FIS Timeout timer for this phy */

	sci_phy->sata_timeout_timer =
@@ -1932,7 +1932,7 @@ scic_sds_phy_stopped_state_start_handler(struct scic_sds_phy *sci_phy) 
	struct scic_sds_controller *scic;



	scic = scic_sds_phy_get_controller(sci_phy),

	ihost = sci_object_get_association(scic);

	ihost = scic->ihost;



	/* Create the SIGNATURE FIS Timeout timer for this phy */

	sci_phy->sata_timeout_timer = isci_timer_create(ihost, sci_phy,
@@ -2220,7 +2220,7 @@ static void scic_sds_phy_stopped_state_enter(void *object) 
{

	struct scic_sds_phy *sci_phy = (struct scic_sds_phy *)object;

	struct scic_sds_controller *scic = scic_sds_phy_get_controller(sci_phy);

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	sci_phy = (struct scic_sds_phy *)object;

drivers/scsi/isci/core/scic_sds_port.c

+8 −8
Original line number Diff line number Diff line
@@ -657,7 +657,7 @@ static void scic_sds_port_activate_phy(struct scic_sds_port *sci_port, 
{

	struct scic_sds_controller *scic = scic_sds_port_get_controller(sci_port);

	struct sci_sas_identify_address_frame_protocols protocols;

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	scic_sds_phy_get_attached_phy_protocols(sci_phy, &protocols);
@@ -679,7 +679,7 @@ void scic_sds_port_deactivate_phy(struct scic_sds_port *sci_port, 
{

	struct scic_sds_controller *scic = scic_sds_port_get_controller(sci_port);

	struct isci_port *iport = sci_object_get_association(sci_port);

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	struct isci_phy *iphy = sci_object_get_association(sci_phy);



	sci_port->active_phy_mask &= ~(1 << sci_phy->phy_index);
@@ -1012,7 +1012,7 @@ void scic_sds_port_broadcast_change_received( 
	struct scic_sds_phy *sci_phy)

{

	struct scic_sds_controller *scic = sci_port->owning_controller;

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	/* notify the user. */

	isci_port_bc_change_received(ihost, sci_port, sci_phy);
@@ -1666,7 +1666,7 @@ static void scic_sds_port_ready_substate_operational_enter(void *object) 
	struct scic_sds_port *sci_port = (struct scic_sds_port *)object;

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	struct isci_port *iport = sci_object_get_association(sci_port);



	scic_sds_port_set_ready_state_handlers(
@@ -1707,7 +1707,7 @@ static void scic_sds_port_ready_substate_operational_exit(void *object) 
	struct scic_sds_port *sci_port = (struct scic_sds_port *)object;

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	struct isci_port *iport = sci_object_get_association(sci_port);



	/*
@@ -1738,7 +1738,7 @@ static void scic_sds_port_ready_substate_configuring_enter(void *object) 
	struct scic_sds_port *sci_port = (struct scic_sds_port *)object;

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	struct isci_port *iport = sci_object_get_association(sci_port);



	scic_sds_port_set_ready_state_handlers(
@@ -1825,7 +1825,7 @@ static enum sci_status 
scic_sds_port_stopped_state_start_handler(struct scic_sds_port *sci_port)

{

	struct scic_sds_controller *scic = sci_port->owning_controller;

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;

	enum sci_status status = SCI_SUCCESS;

	u32 phy_mask;
@@ -2312,7 +2312,7 @@ static void scic_sds_port_ready_state_enter(void *object) 


	sci_port = container_of(object, typeof(*sci_port), parent);

	scic = scic_sds_port_get_controller(sci_port);

	ihost = sci_object_get_association(scic);

	ihost = scic->ihost;

	iport = sci_object_get_association(sci_port);



	/* Put the ready state handlers in place though they will not be there long */

drivers/scsi/isci/core/scic_sds_port_configuration_agent.c

+1 −1
Original line number Diff line number Diff line
@@ -821,7 +821,7 @@ enum sci_status scic_sds_port_configuration_agent_initialize( 
{

	enum sci_status status = SCI_SUCCESS;

	enum scic_port_configuration_mode mode;

	struct isci_host *ihost = sci_object_get_association(scic);

	struct isci_host *ihost = scic->ihost;



	mode = scic->oem_parameters.sds1.controller.mode_type;