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

Commit 26bace34 authored by Dan Williams's avatar Dan Williams
Browse files

isci: replace sci_sas_link_rate with sas_linkrate 



Drop duplicated enum definition.

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

drivers/scsi/isci/core/intel_sas.h

+0 −14
Original line number Diff line number Diff line
@@ -179,20 +179,6 @@ struct sas_capabilities { 


};



/**

 * enum _SCI_SAS_LINK_RATE - This enumeration depicts the SAS specification

 *    defined link speeds.

 *

 *

 */

enum sci_sas_link_rate {

	SCI_SAS_NO_LINK_RATE = 0,

	SCI_SATA_SPINUP_HOLD = 0x3,

	SCI_SAS_150_GB = 0x8,

	SCI_SAS_300_GB = 0x9,

	SCI_SAS_600_GB = 0xA

};



/**

 * enum _SCI_SAS_TASK_ATTRIBUTE - This enumeration depicts the SAM/SAS

 *    specification defined task attribute values for a command information

drivers/scsi/isci/core/scic_phy.h

+2 −1
Original line number Diff line number Diff line
@@ -68,6 +68,7 @@ 


#include "intel_sata.h"

#include "intel_sas.h"

#include <scsi/libsas.h>



struct scic_sds_phy;

struct scic_sds_port;
@@ -93,7 +94,7 @@ struct scic_phy_properties { 
	 * This field specifies the link rate at which the phy is

	 * currently operating.

	 */

	enum sci_sas_link_rate negotiated_link_rate;

	enum sas_linkrate negotiated_link_rate;



	/**

	 * This field indicates the protocols supported by the phy.

drivers/scsi/isci/core/scic_remote_device.h

+1 −1
Original line number Diff line number Diff line
@@ -254,7 +254,7 @@ enum sci_status scic_remote_device_reset_complete( 
 *

 * Return the link rate at which we transfer for the supplied remote device.

 */

enum sci_sas_link_rate scic_remote_device_get_connection_rate(

enum sas_linkrate scic_remote_device_get_connection_rate(

	struct scic_sds_remote_device *remote_device);



/**

drivers/scsi/isci/core/scic_sds_phy.c

+8 −8
Original line number Diff line number Diff line
@@ -696,7 +696,7 @@ static void scic_sds_phy_start_sata_link_training( 
 */

static void scic_sds_phy_complete_link_training(

	struct scic_sds_phy *sci_phy,

	enum sci_sas_link_rate max_link_rate,

	enum sas_linkrate max_link_rate,

	u32 next_state)

{

	sci_phy->max_negotiated_speed = max_link_rate;
@@ -808,21 +808,21 @@ static enum sci_status scic_sds_phy_starting_substate_await_sas_phy_speed_event_ 
	case SCU_EVENT_SAS_15:

	case SCU_EVENT_SAS_15_SSC:

		scic_sds_phy_complete_link_training(

			this_phy, SCI_SAS_150_GB, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF

			this_phy, SAS_LINK_RATE_1_5_GBPS, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF

			);

		break;



	case SCU_EVENT_SAS_30:

	case SCU_EVENT_SAS_30_SSC:

		scic_sds_phy_complete_link_training(

			this_phy, SCI_SAS_300_GB, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF

			this_phy, SAS_LINK_RATE_3_0_GBPS, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF

			);

		break;



	case SCU_EVENT_SAS_60:

	case SCU_EVENT_SAS_60_SSC:

		scic_sds_phy_complete_link_training(

			this_phy, SCI_SAS_600_GB, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF

			this_phy, SAS_LINK_RATE_6_0_GBPS, SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_IAF_UF

			);

		break;
@@ -1082,7 +1082,7 @@ static enum sci_status scic_sds_phy_starting_substate_await_sata_speed_event_han 
	case SCU_EVENT_SATA_15_SSC:

		scic_sds_phy_complete_link_training(

			this_phy,

			SCI_SAS_150_GB,

			SAS_LINK_RATE_1_5_GBPS,

			SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SIG_FIS_UF

			);

		break;
@@ -1091,7 +1091,7 @@ static enum sci_status scic_sds_phy_starting_substate_await_sata_speed_event_han 
	case SCU_EVENT_SATA_30_SSC:

		scic_sds_phy_complete_link_training(

			this_phy,

			SCI_SAS_300_GB,

			SAS_LINK_RATE_3_0_GBPS,

			SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SIG_FIS_UF

			);

		break;
@@ -1100,7 +1100,7 @@ static enum sci_status scic_sds_phy_starting_substate_await_sata_speed_event_han 
	case SCU_EVENT_SATA_60_SSC:

		scic_sds_phy_complete_link_training(

			this_phy,

			SCI_SAS_600_GB,

			SAS_LINK_RATE_6_0_GBPS,

			SCIC_SDS_PHY_STARTING_SUBSTATE_AWAIT_SIG_FIS_UF

			);

		break;
@@ -2439,7 +2439,7 @@ void scic_sds_phy_construct(struct scic_sds_phy *sci_phy, 
	sci_phy->bcn_received_while_port_unassigned = false;

	sci_phy->protocol = SCIC_SDS_PHY_PROTOCOL_UNKNOWN;

	sci_phy->link_layer_registers = NULL;

	sci_phy->max_negotiated_speed = SCI_SAS_NO_LINK_RATE;

	sci_phy->max_negotiated_speed = SAS_LINK_RATE_UNKNOWN;

	sci_phy->sata_timeout_timer = NULL;



	/* Clear out the identification buffer data */

drivers/scsi/isci/core/scic_sds_phy.h

+2 −1
Original line number Diff line number Diff line
@@ -60,6 +60,7 @@ 
#include "intel_sas.h"

#include "scu_registers.h"

#include "sci_base_state_machine.h"

#include <scsi/libsas.h>



struct scic_sds_port;

/**
@@ -243,7 +244,7 @@ struct scic_sds_phy { 
	 * This field indicates whether the phy supports 1.5 Gb/s, 3.0 Gb/s,

	 * or 6.0 Gb/s operation.

	 */

	enum sci_sas_link_rate max_negotiated_speed;

	enum sas_linkrate max_negotiated_speed;



	/**

	 * This member specifies the protocol being utilized on this phy.  This