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

Commit 1bbf148d authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates 2014-11-18

This series contains updates to i40e only.

Shannon provides a patch to clean up the driver to only warn once that
PTP is not supported when linked at 100Mbps.

Mitch provides a fix for i40e where the VF interrupt processing takes
a long time and it is possible that we could lose a VFLR event if it
happens while processing a VFLR on another VF.  To correct this situation,
we enable the VFLR interrupt cause before we begin processing any pending
resets.

Neerav provides several patches to update DCB support in i40e.  When
there are DCB configuration changes based on DCBx, the firmware suspends
the port's Tx and generates an event to the PF.  The PF is then
responsible to reconfigure the PF VSIs and switching topology as per the
updated DCB configuration and then resume the port's Tx by calling the
"Resume Port Tx" AQ command, so add this call to the flow that handles
DCB re-configuration in the PF.  Allow the driver to query and use DCB
configuration from firmware when firmware DCBx agent is in CEE mode.
Add a check whether LLDP Agent's default AdminStatus is enabled or
disabled on a given port, and sets DCBx status to disabled if the
status is disabled.  Fix an issue when the port TC configuration
changes as a result of DCBx and the driver modifies the enabled TCs for
the VEBs it manages but does not update the enabled_tc value that
was cached on a per VEB basis.  Add a new PF state so that if a port's
Tx is in suspended state the Tx queue disable flow would just put the
request for the queue to be disabled and return without waiting for the
queue to be actually disabled.  Allows the driver to enable/disable
the XPS based on the number of TCs being enabled for the given VSI.

v2: Dropped patch "i40e: Handle a single mss packet with more than 8 frags"
    while we rework the patch after we test a bit more based on feedback from
    Eric Dumazet.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents cadaecd2 3ffa037d

drivers/net/ethernet/intel/i40e/i40e.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -146,6 +146,7 @@ enum i40e_state_t { 
	__I40E_DOWN_REQUESTED,

	__I40E_DOWN_REQUESTED,

	__I40E_FD_FLUSH_REQUESTED,

	__I40E_FD_FLUSH_REQUESTED,

	__I40E_RESET_FAILED,

	__I40E_RESET_FAILED,

	__I40E_PORT_TX_SUSPENDED,

};

};





enum i40e_interrupt_policy {

enum i40e_interrupt_policy {

drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h

+43 −2
Original line number Original line Diff line number Diff line
@@ -255,6 +255,7 @@ enum i40e_admin_queue_opc { 
	i40e_aqc_opc_lldp_delete_tlv	= 0x0A04,

	i40e_aqc_opc_lldp_delete_tlv	= 0x0A04,

	i40e_aqc_opc_lldp_stop		= 0x0A05,

	i40e_aqc_opc_lldp_stop		= 0x0A05,

	i40e_aqc_opc_lldp_start		= 0x0A06,

	i40e_aqc_opc_lldp_start		= 0x0A06,

	i40e_aqc_opc_get_cee_dcb_cfg	= 0x0A07,





	/* Tunnel commands */

	/* Tunnel commands */

	i40e_aqc_opc_add_udp_tunnel	= 0x0B00,

	i40e_aqc_opc_add_udp_tunnel	= 0x0B00,
@@ -1987,10 +1988,50 @@ struct i40e_aqc_lldp_start { 




I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);

I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_start);





/* Apply MIB changes (0x0A07)

/* Get CEE DCBX Oper Config (0x0A07)

 * uses the generic struc as it contains no data

 * uses the generic descriptor struct

 * returns below as indirect response

 */

 */





#define I40E_AQC_CEE_APP_FCOE_SHIFT	0x0

#define I40E_AQC_CEE_APP_FCOE_MASK	(0x7 << I40E_AQC_CEE_APP_FCOE_SHIFT)

#define I40E_AQC_CEE_APP_ISCSI_SHIFT	0x3

#define I40E_AQC_CEE_APP_ISCSI_MASK	(0x7 << I40E_AQC_CEE_APP_ISCSI_SHIFT)

#define I40E_AQC_CEE_APP_FIP_SHIFT	0x8

#define I40E_AQC_CEE_APP_FIP_MASK	(0x7 << I40E_AQC_CEE_APP_FIP_SHIFT)

#define I40E_AQC_CEE_PG_STATUS_SHIFT	0x0

#define I40E_AQC_CEE_PG_STATUS_MASK	(0x7 << I40E_AQC_CEE_PG_STATUS_SHIFT)

#define I40E_AQC_CEE_PFC_STATUS_SHIFT	0x3

#define I40E_AQC_CEE_PFC_STATUS_MASK	(0x7 << I40E_AQC_CEE_PFC_STATUS_SHIFT)

#define I40E_AQC_CEE_APP_STATUS_SHIFT	0x8

#define I40E_AQC_CEE_APP_STATUS_MASK	(0x7 << I40E_AQC_CEE_APP_STATUS_SHIFT)

struct i40e_aqc_get_cee_dcb_cfg_v1_resp {

	u8	reserved1;

	u8	oper_num_tc;

	u8	oper_prio_tc[4];

	u8	reserved2;

	u8	oper_tc_bw[8];

	u8	oper_pfc_en;

	u8	reserved3;

	__le16	oper_app_prio;

	u8	reserved4;

	__le16	tlv_status;

};



I40E_CHECK_STRUCT_LEN(0x18, i40e_aqc_get_cee_dcb_cfg_v1_resp);



struct i40e_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;

	__le32	tlv_status;

	u8	reserved[12];

};



I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_get_cee_dcb_cfg_resp);



/* Add Udp Tunnel command and completion (direct 0x0B00) */

/* Add Udp Tunnel command and completion (direct 0x0B00) */

struct i40e_aqc_add_udp_tunnel {

struct i40e_aqc_add_udp_tunnel {

	__le16	udp_port;

	__le16	udp_port;

drivers/net/ethernet/intel/i40e/i40e_common.c

+48 −0
Original line number Original line Diff line number Diff line
@@ -2659,6 +2659,34 @@ i40e_status i40e_aq_start_lldp(struct i40e_hw *hw, 
	return status;

	return status;

}

}





/**

 * i40e_aq_get_cee_dcb_config

 * @hw: pointer to the hw struct

 * @buff: response buffer that stores CEE operational configuration

 * @buff_size: size of the buffer passed

 * @cmd_details: pointer to command details structure or NULL

 *

 * Get CEE DCBX mode operational configuration from firmware

 **/

i40e_status i40e_aq_get_cee_dcb_config(struct i40e_hw *hw,

				       void *buff, u16 buff_size,

				       struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	i40e_status status;



	if (buff_size == 0 || !buff)

		return I40E_ERR_PARAM;



	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_get_cee_dcb_cfg);



	desc.flags |= cpu_to_le16((u16)I40E_AQ_FLAG_BUF);

	status = i40e_asq_send_command(hw, &desc, (void *)buff, buff_size,

				       cmd_details);



	return status;

}



/**

/**

 * i40e_aq_add_udp_tunnel

 * i40e_aq_add_udp_tunnel

 * @hw: pointer to the hw struct

 * @hw: pointer to the hw struct
@@ -3216,6 +3244,26 @@ i40e_status i40e_aq_add_rem_control_packet_filter(struct i40e_hw *hw, 
	return status;

	return status;

}

}





/**

 * i40e_aq_resume_port_tx

 * @hw: pointer to the hardware structure

 * @cmd_details: pointer to command details structure or NULL

 *

 * Resume port's Tx traffic

 **/

i40e_status i40e_aq_resume_port_tx(struct i40e_hw *hw,

				   struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc, i40e_aqc_opc_resume_port_tx);



	status = i40e_asq_send_command(hw, &desc, NULL, 0, cmd_details);



	return status;

}



/**

/**

 * i40e_set_pci_config_data - store PCI bus info

 * i40e_set_pci_config_data - store PCI bus info

 * @hw: pointer to hardware structure

 * @hw: pointer to hardware structure

drivers/net/ethernet/intel/i40e/i40e_dcb.c

+251 −1
Original line number Original line Diff line number Diff line
@@ -59,7 +59,7 @@ i40e_status i40e_get_dcbx_status(struct i40e_hw *hw, u16 *status) 
static void i40e_parse_ieee_etscfg_tlv(struct i40e_lldp_org_tlv *tlv,

static void i40e_parse_ieee_etscfg_tlv(struct i40e_lldp_org_tlv *tlv,

				       struct i40e_dcbx_config *dcbcfg)

				       struct i40e_dcbx_config *dcbcfg)

{

{

	struct i40e_ieee_ets_config *etscfg;

	struct i40e_dcb_ets_config *etscfg;

	u8 *buf = tlv->tlvinfo;

	u8 *buf = tlv->tlvinfo;

	u16 offset = 0;

	u16 offset = 0;

	u8 priority;

	u8 priority;
@@ -406,6 +406,166 @@ i40e_status i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type, 
	return ret;

	return ret;

}

}





/**

 * i40e_cee_to_dcb_v1_config

 * @cee_cfg: pointer to CEE v1 response configuration struct

 * @dcbcfg: DCB configuration struct

 *

 * Convert CEE v1 configuration from firmware to DCB configuration

 **/

static void i40e_cee_to_dcb_v1_config(

			struct i40e_aqc_get_cee_dcb_cfg_v1_resp *cee_cfg,

			struct i40e_dcbx_config *dcbcfg)

{

	u16 status, tlv_status = le16_to_cpu(cee_cfg->tlv_status);

	u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);

	u8 i, tc, err, sync, oper;



	/* CEE PG data to ETS config */

	dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;



	for (i = 0; i < 4; i++) {

		tc = (u8)((cee_cfg->oper_prio_tc[i] &

			 I40E_CEE_PGID_PRIO_1_MASK) >>

			 I40E_CEE_PGID_PRIO_1_SHIFT);

		dcbcfg->etscfg.prioritytable[i*2] =  tc;

		tc = (u8)((cee_cfg->oper_prio_tc[i] &

			 I40E_CEE_PGID_PRIO_0_MASK) >>

			 I40E_CEE_PGID_PRIO_0_SHIFT);

		dcbcfg->etscfg.prioritytable[i*2 + 1] = tc;

	}



	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)

		dcbcfg->etscfg.tcbwtable[i] = cee_cfg->oper_tc_bw[i];



	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

		if (dcbcfg->etscfg.prioritytable[i] == I40E_CEE_PGID_STRICT) {

			/* Map it to next empty TC */

			dcbcfg->etscfg.prioritytable[i] =

						cee_cfg->oper_num_tc - 1;

			dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_STRICT;

		} else {

			dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_ETS;

		}

	}



	/* CEE PFC data to ETS config */

	dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en;

	dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;



	status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >>

		  I40E_AQC_CEE_APP_STATUS_SHIFT;

	err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;

	sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;

	oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;

	/* Add APPs if Error is False and Oper/Sync is True */

	if (!err && sync && oper) {

		/* CEE operating configuration supports FCoE/iSCSI/FIP only */

		dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS;



		/* FCoE APP */

		dcbcfg->app[0].priority =

			(app_prio & I40E_AQC_CEE_APP_FCOE_MASK) >>

			 I40E_AQC_CEE_APP_FCOE_SHIFT;

		dcbcfg->app[0].selector = I40E_APP_SEL_ETHTYPE;

		dcbcfg->app[0].protocolid = I40E_APP_PROTOID_FCOE;



		/* iSCSI APP */

		dcbcfg->app[1].priority =

			(app_prio & I40E_AQC_CEE_APP_ISCSI_MASK) >>

			 I40E_AQC_CEE_APP_ISCSI_SHIFT;

		dcbcfg->app[1].selector = I40E_APP_SEL_TCPIP;

		dcbcfg->app[1].protocolid = I40E_APP_PROTOID_ISCSI;



		/* FIP APP */

		dcbcfg->app[2].priority =

			(app_prio & I40E_AQC_CEE_APP_FIP_MASK) >>

			 I40E_AQC_CEE_APP_FIP_SHIFT;

		dcbcfg->app[2].selector = I40E_APP_SEL_ETHTYPE;

		dcbcfg->app[2].protocolid = I40E_APP_PROTOID_FIP;

	}

}



/**

 * i40e_cee_to_dcb_config

 * @cee_cfg: pointer to CEE configuration struct

 * @dcbcfg: DCB configuration struct

 *

 * Convert CEE configuration from firmware to DCB configuration

 **/

static void i40e_cee_to_dcb_config(

				struct i40e_aqc_get_cee_dcb_cfg_resp *cee_cfg,

				struct i40e_dcbx_config *dcbcfg)

{

	u32 status, tlv_status = le32_to_cpu(cee_cfg->tlv_status);

	u16 app_prio = le16_to_cpu(cee_cfg->oper_app_prio);

	u8 i, tc, err, sync, oper;



	/* CEE PG data to ETS config */

	dcbcfg->etscfg.maxtcs = cee_cfg->oper_num_tc;



	for (i = 0; i < 4; i++) {

		tc = (u8)((cee_cfg->oper_prio_tc[i] &

			 I40E_CEE_PGID_PRIO_1_MASK) >>

			 I40E_CEE_PGID_PRIO_1_SHIFT);

		dcbcfg->etscfg.prioritytable[i*2] =  tc;

		tc = (u8)((cee_cfg->oper_prio_tc[i] &

			 I40E_CEE_PGID_PRIO_0_MASK) >>

			 I40E_CEE_PGID_PRIO_0_SHIFT);

		dcbcfg->etscfg.prioritytable[i*2 + 1] = tc;

	}



	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++)

		dcbcfg->etscfg.tcbwtable[i] = cee_cfg->oper_tc_bw[i];



	for (i = 0; i < I40E_MAX_TRAFFIC_CLASS; i++) {

		if (dcbcfg->etscfg.prioritytable[i] == I40E_CEE_PGID_STRICT) {

			/* Map it to next empty TC */

			dcbcfg->etscfg.prioritytable[i] =

						cee_cfg->oper_num_tc - 1;

			dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_STRICT;

		} else {

			dcbcfg->etscfg.tsatable[i] = I40E_IEEE_TSA_ETS;

		}

	}



	/* CEE PFC data to ETS config */

	dcbcfg->pfc.pfcenable = cee_cfg->oper_pfc_en;

	dcbcfg->pfc.pfccap = I40E_MAX_TRAFFIC_CLASS;



	status = (tlv_status & I40E_AQC_CEE_APP_STATUS_MASK) >>

		  I40E_AQC_CEE_APP_STATUS_SHIFT;

	err = (status & I40E_TLV_STATUS_ERR) ? 1 : 0;

	sync = (status & I40E_TLV_STATUS_SYNC) ? 1 : 0;

	oper = (status & I40E_TLV_STATUS_OPER) ? 1 : 0;

	/* Add APPs if Error is False and Oper/Sync is True */

	if (!err && sync && oper) {

		/* CEE operating configuration supports FCoE/iSCSI/FIP only */

		dcbcfg->numapps = I40E_CEE_OPER_MAX_APPS;



		/* FCoE APP */

		dcbcfg->app[0].priority =

			(app_prio & I40E_AQC_CEE_APP_FCOE_MASK) >>

			 I40E_AQC_CEE_APP_FCOE_SHIFT;

		dcbcfg->app[0].selector = I40E_APP_SEL_ETHTYPE;

		dcbcfg->app[0].protocolid = I40E_APP_PROTOID_FCOE;



		/* iSCSI APP */

		dcbcfg->app[1].priority =

			(app_prio & I40E_AQC_CEE_APP_ISCSI_MASK) >>

			 I40E_AQC_CEE_APP_ISCSI_SHIFT;

		dcbcfg->app[1].selector = I40E_APP_SEL_TCPIP;

		dcbcfg->app[1].protocolid = I40E_APP_PROTOID_ISCSI;



		/* FIP APP */

		dcbcfg->app[2].priority =

			(app_prio & I40E_AQC_CEE_APP_FIP_MASK) >>

			 I40E_AQC_CEE_APP_FIP_SHIFT;

		dcbcfg->app[2].selector = I40E_APP_SEL_ETHTYPE;

		dcbcfg->app[2].protocolid = I40E_APP_PROTOID_FIP;

	}

}



/**

/**

 * i40e_get_dcb_config

 * i40e_get_dcb_config

 * @hw: pointer to the hw struct

 * @hw: pointer to the hw struct
@@ -415,7 +575,44 @@ i40e_status i40e_aq_get_dcb_config(struct i40e_hw *hw, u8 mib_type, 
i40e_status i40e_get_dcb_config(struct i40e_hw *hw)

i40e_status i40e_get_dcb_config(struct i40e_hw *hw)

{

{

	i40e_status ret = 0;

	i40e_status ret = 0;

	struct i40e_aqc_get_cee_dcb_cfg_resp cee_cfg;

	struct i40e_aqc_get_cee_dcb_cfg_v1_resp cee_v1_cfg;



	/* If Firmware version < v4.33 IEEE only */

	if (((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver < 33)) ||

	    (hw->aq.fw_maj_ver < 4))

		goto ieee;



	/* If Firmware version == v4.33 use old CEE struct */

	if ((hw->aq.fw_maj_ver == 4) && (hw->aq.fw_min_ver == 33)) {

		ret = i40e_aq_get_cee_dcb_config(hw, &cee_v1_cfg,

						 sizeof(cee_v1_cfg), NULL);

		if (!ret) {

			/* CEE mode */

			hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;

			i40e_cee_to_dcb_v1_config(&cee_v1_cfg,

						  &hw->local_dcbx_config);

		}

	} else {

		ret = i40e_aq_get_cee_dcb_config(hw, &cee_cfg,

						 sizeof(cee_cfg), NULL);

		if (!ret) {

			/* CEE mode */

			hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_CEE;

			i40e_cee_to_dcb_config(&cee_cfg,

					       &hw->local_dcbx_config);

		}

	}



	/* CEE mode not enabled try querying IEEE data */

	if (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT)

		goto ieee;

	else

		goto out;





ieee:

	/* IEEE mode */

	hw->local_dcbx_config.dcbx_mode = I40E_DCBX_MODE_IEEE;

	/* Get Local DCB Config */

	/* Get Local DCB Config */

	ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_LOCAL, 0,

	ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_LOCAL, 0,

				     &hw->local_dcbx_config);

				     &hw->local_dcbx_config);
@@ -426,6 +623,10 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw) 
	ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_REMOTE,

	ret = i40e_aq_get_dcb_config(hw, I40E_AQ_LLDP_MIB_REMOTE,

				     I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE,

				     I40E_AQ_LLDP_BRIDGE_TYPE_NEAREST_BRIDGE,

				     &hw->remote_dcbx_config);

				     &hw->remote_dcbx_config);

	/* Don't treat ENOENT as an error for Remote MIBs */

	if (hw->aq.asq_last_status == I40E_AQ_RC_ENOENT)

		ret = 0;



out:

out:

	return ret;

	return ret;

}

}
@@ -439,10 +640,27 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw) 
i40e_status i40e_init_dcb(struct i40e_hw *hw)

i40e_status i40e_init_dcb(struct i40e_hw *hw)

{

{

	i40e_status ret = 0;

	i40e_status ret = 0;

	struct i40e_lldp_variables lldp_cfg;

	u8 adminstatus = 0;





	if (!hw->func_caps.dcb)

	if (!hw->func_caps.dcb)

		return ret;

		return ret;





	/* Read LLDP NVM area */

	ret = i40e_read_lldp_cfg(hw, &lldp_cfg);

	if (ret)

		return ret;



	/* Get the LLDP AdminStatus for the current port */

	adminstatus = lldp_cfg.adminstatus >> (hw->port * 4);

	adminstatus &= 0xF;



	/* LLDP agent disabled */

	if (!adminstatus) {

		hw->dcbx_status = I40E_DCBX_STATUS_DISABLED;

		return ret;

	}



	/* Get DCBX status */

	/* Get DCBX status */

	ret = i40e_get_dcbx_status(hw, &hw->dcbx_status);

	ret = i40e_get_dcbx_status(hw, &hw->dcbx_status);

	if (ret)

	if (ret)
@@ -454,6 +672,8 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw) 
	case I40E_DCBX_STATUS_IN_PROGRESS:

	case I40E_DCBX_STATUS_IN_PROGRESS:

		/* Get current DCBX configuration */

		/* Get current DCBX configuration */

		ret = i40e_get_dcb_config(hw);

		ret = i40e_get_dcb_config(hw);

		if (ret)

			return ret;

		break;

		break;

	case I40E_DCBX_STATUS_DISABLED:

	case I40E_DCBX_STATUS_DISABLED:

		return ret;

		return ret;
@@ -470,3 +690,33 @@ i40e_status i40e_init_dcb(struct i40e_hw *hw) 




	return ret;

	return ret;

}

}



/**

 * i40e_read_lldp_cfg - read LLDP Configuration data from NVM

 * @hw: pointer to the HW structure

 * @lldp_cfg: pointer to hold lldp configuration variables

 *

 * Reads the LLDP configuration data from NVM

 **/

i40e_status i40e_read_lldp_cfg(struct i40e_hw *hw,

			       struct i40e_lldp_variables *lldp_cfg)

{

	i40e_status ret = 0;

	u32 offset = (2 * I40E_NVM_LLDP_CFG_PTR);



	if (!lldp_cfg)

		return I40E_ERR_PARAM;



	ret = i40e_acquire_nvm(hw, I40E_RESOURCE_READ);

	if (ret)

		goto err_lldp_cfg;



	ret = i40e_aq_read_nvm(hw, I40E_SR_EMP_MODULE_PTR, offset,

			       sizeof(struct i40e_lldp_variables),

			       (u8 *)lldp_cfg,

			       true, NULL);

	i40e_release_nvm(hw);



err_lldp_cfg:

	return ret;

}

drivers/net/ethernet/intel/i40e/i40e_dcb.h

+5 −0
Original line number Original line Diff line number Diff line
@@ -65,6 +65,11 @@ 
#define I40E_IEEE_ETS_PRIO_0_MASK	(0x7 << I40E_IEEE_ETS_PRIO_0_SHIFT)

#define I40E_IEEE_ETS_PRIO_0_MASK	(0x7 << I40E_IEEE_ETS_PRIO_0_SHIFT)

#define I40E_IEEE_ETS_PRIO_1_SHIFT	4

#define I40E_IEEE_ETS_PRIO_1_SHIFT	4

#define I40E_IEEE_ETS_PRIO_1_MASK	(0x7 << I40E_IEEE_ETS_PRIO_1_SHIFT)

#define I40E_IEEE_ETS_PRIO_1_MASK	(0x7 << I40E_IEEE_ETS_PRIO_1_SHIFT)

#define I40E_CEE_PGID_PRIO_0_SHIFT	0

#define I40E_CEE_PGID_PRIO_0_MASK	(0xF << I40E_CEE_PGID_PRIO_0_SHIFT)

#define I40E_CEE_PGID_PRIO_1_SHIFT	4

#define I40E_CEE_PGID_PRIO_1_MASK	(0xF << I40E_CEE_PGID_PRIO_1_SHIFT)

#define I40E_CEE_PGID_STRICT		15





/* Defines for IEEE TSA types */

/* Defines for IEEE TSA types */

#define I40E_IEEE_TSA_STRICT		0

#define I40E_IEEE_TSA_STRICT		0