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

Commit 0ebd3ff1 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Add code for DCB initialization part 2/4 



This patch introduces a new top level function ice_init_dcb (and
related lower level helper functions) which continues the DCB init
flow.

This function uses ice_get_dcb_cfg to get, parse and store the DCB
configuration. Once this is done, it sets itself up to be notified
by the firmware on LLDP MIB change events.

Reviewed-by: default avatarBruce Allan <bruce.w.allan@intel.com>
Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 37b6f646

drivers/net/ethernet/intel/ice/ice_adminq_cmd.h

+79 −0
Original line number Diff line number Diff line
@@ -1132,6 +1132,48 @@ struct ice_aqc_pf_vf_msg { 
	__le32 addr_low;

};



/* Get LLDP MIB (indirect 0x0A00)

 * Note: This is also used by the LLDP MIB Change Event (0x0A01)

 * as the format is the same.

 */

struct ice_aqc_lldp_get_mib {

	u8 type;

#define ICE_AQ_LLDP_MIB_TYPE_S			0

#define ICE_AQ_LLDP_MIB_TYPE_M			(0x3 << ICE_AQ_LLDP_MIB_TYPE_S)

#define ICE_AQ_LLDP_MIB_LOCAL			0

#define ICE_AQ_LLDP_MIB_REMOTE			1

#define ICE_AQ_LLDP_MIB_LOCAL_AND_REMOTE	2

#define ICE_AQ_LLDP_BRID_TYPE_S			2

#define ICE_AQ_LLDP_BRID_TYPE_M			(0x3 << ICE_AQ_LLDP_BRID_TYPE_S)

#define ICE_AQ_LLDP_BRID_TYPE_NEAREST_BRID	0

#define ICE_AQ_LLDP_BRID_TYPE_NON_TPMR		1

/* Tx pause flags in the 0xA01 event use ICE_AQ_LLDP_TX_* */

#define ICE_AQ_LLDP_TX_S			0x4

#define ICE_AQ_LLDP_TX_M			(0x03 << ICE_AQ_LLDP_TX_S)

#define ICE_AQ_LLDP_TX_ACTIVE			0

#define ICE_AQ_LLDP_TX_SUSPENDED		1

#define ICE_AQ_LLDP_TX_FLUSHED			3

/* The following bytes are reserved for the Get LLDP MIB command (0x0A00)

 * and in the LLDP MIB Change Event (0x0A01). They are valid for the

 * Get LLDP MIB (0x0A00) response only.

 */

	u8 reserved1;

	__le16 local_len;

	__le16 remote_len;

	u8 reserved2[2];

	__le32 addr_high;

	__le32 addr_low;

};



/* Configure LLDP MIB Change Event (direct 0x0A01) */

/* For MIB Change Event use ice_aqc_lldp_get_mib structure above */

struct ice_aqc_lldp_set_mib_change {

	u8 command;

#define ICE_AQ_LLDP_MIB_UPDATE_ENABLE		0x0

#define ICE_AQ_LLDP_MIB_UPDATE_DIS		0x1

	u8 reserved[15];

};



/* Start LLDP (direct 0x0A06) */

struct ice_aqc_lldp_start {

	u8 command;
@@ -1140,6 +1182,36 @@ struct ice_aqc_lldp_start { 
	u8 reserved[15];

};



/* Get CEE DCBX Oper Config (0x0A07)

 * The command uses the generic descriptor struct and

 * returns the struct below as an indirect response.

 */

struct ice_aqc_get_cee_dcb_cfg_resp {

	u8 oper_num_tc;

	u8 oper_prio_tc[4];

	u8 oper_tc_bw[8];

	u8 oper_pfc_en;

	__le16 oper_app_prio;

#define ICE_AQC_CEE_APP_FCOE_S		0

#define ICE_AQC_CEE_APP_FCOE_M		(0x7 << ICE_AQC_CEE_APP_FCOE_S)

#define ICE_AQC_CEE_APP_ISCSI_S		3

#define ICE_AQC_CEE_APP_ISCSI_M		(0x7 << ICE_AQC_CEE_APP_ISCSI_S)

#define ICE_AQC_CEE_APP_FIP_S		8

#define ICE_AQC_CEE_APP_FIP_M		(0x7 << ICE_AQC_CEE_APP_FIP_S)

	__le32 tlv_status;

#define ICE_AQC_CEE_PG_STATUS_S		0

#define ICE_AQC_CEE_PG_STATUS_M		(0x7 << ICE_AQC_CEE_PG_STATUS_S)

#define ICE_AQC_CEE_PFC_STATUS_S	3

#define ICE_AQC_CEE_PFC_STATUS_M	(0x7 << ICE_AQC_CEE_PFC_STATUS_S)

#define ICE_AQC_CEE_FCOE_STATUS_S	8

#define ICE_AQC_CEE_FCOE_STATUS_M	(0x7 << ICE_AQC_CEE_FCOE_STATUS_S)

#define ICE_AQC_CEE_ISCSI_STATUS_S	11

#define ICE_AQC_CEE_ISCSI_STATUS_M	(0x7 << ICE_AQC_CEE_ISCSI_STATUS_S)

#define ICE_AQC_CEE_FIP_STATUS_S	16

#define ICE_AQC_CEE_FIP_STATUS_M	(0x7 << ICE_AQC_CEE_FIP_STATUS_S)

	u8 reserved[12];

};



/* Stop/Start LLDP Agent (direct 0x0A09)

 * Used for stopping/starting specific LLDP agent. e.g. DCBx.

 * The same structure is used for the response, with the command field
@@ -1411,6 +1483,8 @@ struct ice_aq_desc { 
		struct ice_aqc_query_txsched_res query_sched_res;

		struct ice_aqc_nvm nvm;

		struct ice_aqc_pf_vf_msg virt;

		struct ice_aqc_lldp_get_mib lldp_get_mib;

		struct ice_aqc_lldp_set_mib_change lldp_set_event;

		struct ice_aqc_lldp_start lldp_start;

		struct ice_aqc_lldp_stop_start_specific_agent lldp_agent_ctrl;

		struct ice_aqc_get_set_rss_lut get_set_rss_lut;
@@ -1445,6 +1519,8 @@ struct ice_aq_desc { 
/* error codes */

enum ice_aq_err {

	ICE_AQ_RC_OK		= 0,  /* Success */

	ICE_AQ_RC_EPERM		= 1,  /* Operation not permitted */

	ICE_AQ_RC_ENOENT	= 2,  /* No such element */

	ICE_AQ_RC_ENOMEM	= 9,  /* Out of memory */

	ICE_AQ_RC_EBUSY		= 12, /* Device or resource busy */

	ICE_AQ_RC_EEXIST	= 13, /* Object already exists */
@@ -1515,7 +1591,10 @@ enum ice_adminq_opc { 
	ice_mbx_opc_send_msg_to_pf			= 0x0801,

	ice_mbx_opc_send_msg_to_vf			= 0x0802,

	/* LLDP commands */

	ice_aqc_opc_lldp_get_mib			= 0x0A00,

	ice_aqc_opc_lldp_set_mib_change			= 0x0A01,

	ice_aqc_opc_lldp_start				= 0x0A06,

	ice_aqc_opc_get_cee_dcb_cfg			= 0x0A07,

	ice_aqc_opc_lldp_stop_start_specific_agent	= 0x0A09,



	/* RSS commands */

drivers/net/ethernet/intel/ice/ice_dcb.c

+819 −0

File changed.

Preview size limit exceeded, changes collapsed.

drivers/net/ethernet/intel/ice/ice_dcb.h

+99 −0
Original line number Diff line number Diff line
@@ -8,8 +8,107 @@ 


#define ICE_DCBX_STATUS_IN_PROGRESS	1

#define ICE_DCBX_STATUS_DONE		2

#define ICE_DCBX_STATUS_DIS		7



#define ICE_TLV_TYPE_END		0

#define ICE_TLV_TYPE_ORG		127



#define ICE_IEEE_8021QAZ_OUI		0x0080C2

#define ICE_IEEE_SUBTYPE_ETS_CFG	9

#define ICE_IEEE_SUBTYPE_ETS_REC	10

#define ICE_IEEE_SUBTYPE_PFC_CFG	11

#define ICE_IEEE_SUBTYPE_APP_PRI	12



#define ICE_CEE_DCBX_OUI		0x001B21

#define ICE_CEE_DCBX_TYPE		2

#define ICE_CEE_SUBTYPE_PG_CFG		2

#define ICE_CEE_SUBTYPE_PFC_CFG		3

#define ICE_CEE_SUBTYPE_APP_PRI		4

#define ICE_CEE_MAX_FEAT_TYPE		3

/* Defines for LLDP TLV header */

#define ICE_LLDP_TLV_LEN_S		0

#define ICE_LLDP_TLV_LEN_M		(0x01FF << ICE_LLDP_TLV_LEN_S)

#define ICE_LLDP_TLV_TYPE_S		9

#define ICE_LLDP_TLV_TYPE_M		(0x7F << ICE_LLDP_TLV_TYPE_S)

#define ICE_LLDP_TLV_SUBTYPE_S		0

#define ICE_LLDP_TLV_SUBTYPE_M		(0xFF << ICE_LLDP_TLV_SUBTYPE_S)

#define ICE_LLDP_TLV_OUI_S		8

#define ICE_LLDP_TLV_OUI_M		(0xFFFFFFUL << ICE_LLDP_TLV_OUI_S)



/* Defines for IEEE ETS TLV */

#define ICE_IEEE_ETS_MAXTC_S	0

#define ICE_IEEE_ETS_MAXTC_M		(0x7 << ICE_IEEE_ETS_MAXTC_S)

#define ICE_IEEE_ETS_CBS_S		6

#define ICE_IEEE_ETS_CBS_M		BIT(ICE_IEEE_ETS_CBS_S)

#define ICE_IEEE_ETS_WILLING_S		7

#define ICE_IEEE_ETS_WILLING_M		BIT(ICE_IEEE_ETS_WILLING_S)

#define ICE_IEEE_ETS_PRIO_0_S		0

#define ICE_IEEE_ETS_PRIO_0_M		(0x7 << ICE_IEEE_ETS_PRIO_0_S)

#define ICE_IEEE_ETS_PRIO_1_S		4

#define ICE_IEEE_ETS_PRIO_1_M		(0x7 << ICE_IEEE_ETS_PRIO_1_S)

#define ICE_CEE_PGID_PRIO_0_S		0

#define ICE_CEE_PGID_PRIO_0_M		(0xF << ICE_CEE_PGID_PRIO_0_S)

#define ICE_CEE_PGID_PRIO_1_S		4

#define ICE_CEE_PGID_PRIO_1_M		(0xF << ICE_CEE_PGID_PRIO_1_S)

#define ICE_CEE_PGID_STRICT		15



/* Defines for IEEE TSA types */

#define ICE_IEEE_TSA_STRICT		0

#define ICE_IEEE_TSA_ETS		2



/* Defines for IEEE PFC TLV */

#define ICE_IEEE_PFC_CAP_S		0

#define ICE_IEEE_PFC_CAP_M		(0xF << ICE_IEEE_PFC_CAP_S)

#define ICE_IEEE_PFC_MBC_S		6

#define ICE_IEEE_PFC_MBC_M		BIT(ICE_IEEE_PFC_MBC_S)

#define ICE_IEEE_PFC_WILLING_S		7

#define ICE_IEEE_PFC_WILLING_M		BIT(ICE_IEEE_PFC_WILLING_S)



/* Defines for IEEE APP TLV */

#define ICE_IEEE_APP_SEL_S		0

#define ICE_IEEE_APP_SEL_M		(0x7 << ICE_IEEE_APP_SEL_S)

#define ICE_IEEE_APP_PRIO_S		5

#define ICE_IEEE_APP_PRIO_M		(0x7 << ICE_IEEE_APP_PRIO_S)



/* IEEE 802.1AB LLDP Organization specific TLV */

struct ice_lldp_org_tlv {

	__be16 typelen;

	__be32 ouisubtype;

	u8 tlvinfo[1];

} __packed;



struct ice_cee_tlv_hdr {

	__be16 typelen;

	u8 operver;

	u8 maxver;

};



struct ice_cee_ctrl_tlv {

	struct ice_cee_tlv_hdr hdr;

	__be32 seqno;

	__be32 ackno;

};



struct ice_cee_feat_tlv {

	struct ice_cee_tlv_hdr hdr;

	u8 en_will_err; /* Bits: |En|Will|Err|Reserved(5)| */

#define ICE_CEE_FEAT_TLV_ENA_M		0x80

#define ICE_CEE_FEAT_TLV_WILLING_M	0x40

#define ICE_CEE_FEAT_TLV_ERR_M		0x20

	u8 subtype;

	u8 tlvinfo[1];

};



struct ice_cee_app_prio {

	__be16 protocol;

	u8 upper_oui_sel; /* Bits: |Upper OUI(6)|Selector(2)| */

#define ICE_CEE_APP_SELECTOR_M	0x03

	__be16 lower_oui;

	u8 prio_map;

} __packed;



u8 ice_get_dcbx_status(struct ice_hw *hw);

enum ice_status ice_init_dcb(struct ice_hw *hw);

#ifdef CONFIG_DCB

enum ice_status ice_aq_start_lldp(struct ice_hw *hw, struct ice_sq_cd *cd);

enum ice_status

drivers/net/ethernet/intel/ice/ice_dcb_lib.c

+1 −1
Original line number Diff line number Diff line
@@ -38,5 +38,5 @@ int ice_init_pf_dcb(struct ice_pf *pf) 
		ice_aq_start_stop_dcbx(hw, true, &dcbx_status, NULL);

	}



	return 0;

	return ice_init_dcb(hw);

}

drivers/net/ethernet/intel/ice/ice_status.h

+1 −0
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ enum ice_status { 
	ICE_ERR_PARAM				= -1,

	ICE_ERR_NOT_IMPL			= -2,

	ICE_ERR_NOT_READY			= -3,

	ICE_ERR_NOT_SUPPORTED			= -4,

	ICE_ERR_BAD_PTR				= -5,

	ICE_ERR_INVAL_SIZE			= -6,

	ICE_ERR_DEVICE_NOT_SUPPORTED		= -8,