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

Commit cc3dbd0a authored by Artur Wojcik's avatar Artur Wojcik Committed by Dan Williams
Browse files

isci: unify isci_host data structures 



Make it explicit that isci_host and scic_sds_controller are one in the same
object.

Signed-off-by: default avatarArtur Wojcik <artur.wojcik@intel.com>
[removed ->ihost back pointer]
Signed-off-by: default avatarDan Williams <dan.j.williams@intel.com>
parent d06b487b

drivers/scsi/isci/core/scic_sds_controller.c

+7 −15
Original line number Diff line number Diff line
@@ -214,7 +214,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	scic->power_control.timer = isci_timer_create(ihost,

						      scic,

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

	enum sci_status status)

{

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



	if (scic->state_machine.current_state_id ==

	    SCI_BASE_CONTROLLER_STATE_STARTING) {
@@ -603,7 +603,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	struct sci_base_state_machine *sm = &scic->state_machine;



	if (sm->current_state_id == SCI_BASE_CONTROLLER_STATE_STARTING)
@@ -771,7 +771,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



	scic->phy_startup_timer = isci_timer_create(ihost,

						    scic,
@@ -1775,7 +1775,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	u16 index;



	/* Default to APC mode. */
@@ -2619,17 +2619,12 @@ static enum sci_status scic_controller_set_interrupt_coalescence( 
}





struct scic_sds_controller *scic_controller_alloc(struct device *dev)

{

	return devm_kzalloc(dev, sizeof(struct scic_sds_controller), GFP_KERNEL);

}



enum sci_status scic_controller_initialize(

	struct scic_sds_controller *scic)

enum sci_status scic_controller_initialize(struct scic_sds_controller *scic)

{

	struct sci_base_state_machine *sm = &scic->state_machine;

	enum sci_status result = SCI_SUCCESS;

	struct isci_host *ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	u32 index, state;



	if (scic->state_machine.current_state_id !=
@@ -2640,9 +2635,6 @@ enum sci_status scic_controller_initialize( 
		return SCI_FAILURE_INVALID_STATE;

	}





	ihost = scic->ihost;



	sci_base_state_machine_change_state(sm, SCI_BASE_CONTROLLER_STATE_INITIALIZING);



	scic->timeout_timer = isci_timer_create(ihost,

drivers/scsi/isci/core/scic_sds_controller.h

+0 −6
Original line number Diff line number Diff line
@@ -125,18 +125,12 @@ struct scic_power_control { 


};



struct isci_host;

/**

 * struct scic_sds_controller -

 *

 * This structure represents the SCU controller object.

 */

struct scic_sds_controller {

	/**

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

	 */

	struct isci_host *ihost;



	/**

	 * This field contains the information for the base controller state

	 * machine.

drivers/scsi/isci/core/scic_sds_phy.c

+3 −3
Original line number Diff line number Diff line
@@ -339,7 +339,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



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

	sci_phy->sata_timeout_timer =
@@ -1790,7 +1790,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 = scic->ihost;

	ihost = scic_to_ihost(scic);



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

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

	struct scic_sds_phy *sci_phy = object;

	struct scic_sds_controller *scic = scic_sds_phy_get_controller(sci_phy);

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



	/*

	 * @todo We need to get to the controller to place this PE in a

drivers/scsi/isci/core/scic_sds_port.c

+14 −20
Original line number Diff line number Diff line
@@ -625,7 +625,7 @@ static void scic_sds_port_activate_phy(struct scic_sds_port *sci_port, 
				       bool do_notify_user)

{

	struct scic_sds_controller *scic = sci_port->owning_controller;

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



	if (sci_phy->protocol != SCIC_SDS_PHY_PROTOCOL_SATA)

		scic_sds_phy_resume(sci_phy);
@@ -644,7 +644,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_port->iport;

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	struct isci_phy *iphy = sci_phy->iphy;



	sci_port->active_phy_mask &= ~(1 << sci_phy->phy_index);
@@ -667,12 +667,10 @@ void scic_sds_port_deactivate_phy(struct scic_sds_port *sci_port, 
 * This function will disable the phy and report that the phy is not valid for

 * this port object. None

 */

static void scic_sds_port_invalid_link_up(

	struct scic_sds_port *sci_port,

static void scic_sds_port_invalid_link_up(struct scic_sds_port *sci_port,

					  struct scic_sds_phy *sci_phy)

{

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct scic_sds_controller *scic = sci_port->owning_controller;



	/*

	 * Check to see if we have alreay reported this link as bad and if
@@ -681,7 +679,7 @@ static void scic_sds_port_invalid_link_up( 
	 */

	if ((scic->invalid_phy_mask & (1 << sci_phy->phy_index)) == 0) {

		scic_sds_controller_set_invalid_phy(scic, sci_phy);

		isci_port_invalid_link_up(scic, sci_port, sci_phy);

		dev_warn(&scic_to_ihost(scic)->pdev->dev, "Invalid link up!\n");

	}

}
@@ -971,7 +969,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



	/* notify the user. */

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

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	struct isci_port *iport = sci_port->iport;



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

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	struct isci_port *iport = sci_port->iport;



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

	struct scic_sds_controller *scic =

		scic_sds_port_get_controller(sci_port);

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	struct isci_port *iport = sci_port->iport;



	scic_sds_port_set_ready_state_handlers(
@@ -1784,7 +1782,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 = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);

	enum sci_status status = SCI_SUCCESS;

	u32 phy_mask;
@@ -2259,16 +2257,12 @@ static void scic_sds_port_stopped_state_exit(void *object) 
 */

static void scic_sds_port_ready_state_enter(void *object)

{

	struct scic_sds_controller *scic;

	struct scic_sds_port *sci_port = object;

	struct isci_port *iport;

	struct isci_host *ihost;

	struct scic_sds_controller *scic = sci_port->owning_controller;

	struct isci_host *ihost = scic_to_ihost(scic);

	struct isci_port *iport = sci_port->iport;

	u32 prev_state;



	scic = scic_sds_port_get_controller(sci_port);

	ihost = scic->ihost;

	iport = sci_port->iport;



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

	scic_sds_port_set_base_state_handlers(sci_port, SCI_BASE_PORT_STATE_READY);

drivers/scsi/isci/core/scic_sds_port_configuration_agent.c

+1 −8
Original line number Diff line number Diff line
@@ -808,20 +808,13 @@ void scic_sds_port_configuration_agent_construct( 
	}

}



/**

 *

 * @controller: This is the controller object for which the port agent is being

 *    initialized.

 *

 * This method will construct the port configuration agent for this controller.

 */

enum sci_status scic_sds_port_configuration_agent_initialize(

	struct scic_sds_controller *scic,

	struct scic_sds_port_configuration_agent *port_agent)

{

	enum sci_status status = SCI_SUCCESS;

	enum scic_port_configuration_mode mode;

	struct isci_host *ihost = scic->ihost;

	struct isci_host *ihost = scic_to_ihost(scic);



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