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

Commit 6247fd9f authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/next-queue 



Jeff Kirsher says:

====================
40GbE Intel Wired LAN Driver Updates 2016-02-03

This series contains updates to i40e and i40evf only.

Kiran adds the MAC filter element to the end of the list instead of HEAD
just in case there are ever any ordering issues in the future.

Anjali fixes several RSS issues, first fixes the hash PCTYPE enable for
X722 since it supports a broader selection of PCTYPES for TCP and UDP.
Then fixes a bug in XL710, X710, and X722 support for RSS since we cannot
reduce the 4-tuple for RSS for TCP/IPv4/IPv6 or UDP/IPv4/IPv6 packets
since this requires a product feature change coming in a later release.
Cleans up the reset code where the restart-autoneg workaround is
applied, since X722 does not need the workaround, add a flag to indicate
which MAC and firmware version require the workaround to be applied.
Adds new device id's for X722 and code to add their support.  Also
adds another way to access the RSS keys and lookup table using the admin
queue for X722 devices.

Catherine updates the driver to replace the MAC check with a feature
flag check for 100M SGMII, since it is only support on X722 devices
currently.

Mitch reworks the VF driver to allow channel bonding, which was not
possible before this patch due to the asynchronous nature of the admin
queue mechanism.  Also fixes a rare case which causes a panic if the
VF driver is removed during reset recovery, resolve this by setting the
ring pointers to NULL after freeing them.

Shannon cleans up the driver where device capabilities were defined in
two different places, and neither had all the definitions, so he
consolidates the definitions in the admin queue API.  Also adds the new
proxy-wake-on-lan capability bit available with the new X722 device.
Lastly, added the new External Device Power Ability field to the
get_link_status data structure by using a reserved field at the end
of the structure.

Jesse mimics the ixgbe driver's use of a private work queue in the i40e
and i40evf drivers to avoid blocking the system work queue.

Greg cleans up the driver to limit the firmware revision checks to
properly handle DCB configurations from the firmware to the older
devices which need these checks (specifically X710 and XL710 devices
only).
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 296d4856 f8db54cc

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

+2 −0
Original line number Diff line number Diff line
@@ -339,6 +339,8 @@ struct i40e_pf { 
#define I40E_FLAG_VEB_MODE_ENABLED		BIT_ULL(40)

#define I40E_FLAG_GENEVE_OFFLOAD_CAPABLE	BIT_ULL(41)

#define I40E_FLAG_NO_PCI_LINK_CHECK		BIT_ULL(42)

#define I40E_FLAG_100M_SGMII_CAPABLE		BIT_ULL(43)

#define I40E_FLAG_RESTART_AUTONEG		BIT_ULL(44)

#define I40E_FLAG_PF_MAC			BIT_ULL(50)



	/* tracks features that get auto disabled by errors */

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

+23 −3
Original line number Diff line number Diff line
@@ -220,6 +220,7 @@ enum i40e_admin_queue_opc { 
	i40e_aqc_opc_get_phy_wol_caps		= 0x0621,

	i40e_aqc_opc_set_phy_debug		= 0x0622,

	i40e_aqc_opc_upload_ext_phy_fm		= 0x0625,

	i40e_aqc_opc_run_phy_activity		= 0x0626,



	/* NVM commands */

	i40e_aqc_opc_nvm_read			= 0x0701,
@@ -402,6 +403,7 @@ struct i40e_aqc_list_capabilities_element_resp { 
#define I40E_AQ_CAP_ID_OS2BMC_CAP	0x0004

#define I40E_AQ_CAP_ID_FUNCTIONS_VALID	0x0005

#define I40E_AQ_CAP_ID_ALTERNATE_RAM	0x0006

#define I40E_AQ_CAP_ID_WOL_AND_PROXY	0x0008

#define I40E_AQ_CAP_ID_SRIOV		0x0012

#define I40E_AQ_CAP_ID_VF		0x0013

#define I40E_AQ_CAP_ID_VMDQ		0x0014
@@ -422,6 +424,7 @@ struct i40e_aqc_list_capabilities_element_resp { 
#define I40E_AQ_CAP_ID_LED		0x0061

#define I40E_AQ_CAP_ID_SDP		0x0062

#define I40E_AQ_CAP_ID_MDIO		0x0063

#define I40E_AQ_CAP_ID_WSR_PROT		0x0064

#define I40E_AQ_CAP_ID_FLEX10		0x00F1

#define I40E_AQ_CAP_ID_CEM		0x00F2
@@ -1257,9 +1260,9 @@ struct i40e_aqc_add_remove_cloud_filters_element_data { 


#define I40E_AQC_ADD_CLOUD_TNL_TYPE_SHIFT		9

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_MASK		0x1E00

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_XVLAN		0

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_VXLAN		0

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_NVGRE_OMAC		1

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_NGE			2

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_GENEVE		2

#define I40E_AQC_ADD_CLOUD_TNL_TYPE_IP			3



	__le32	tenant_id;
@@ -1755,7 +1758,12 @@ struct i40e_aqc_get_link_status { 
	u8	config;

#define I40E_AQ_CONFIG_CRC_ENA		0x04

#define I40E_AQ_CONFIG_PACING_MASK	0x78

	u8	reserved[5];

	u8	external_power_ability;

#define I40E_AQ_LINK_POWER_CLASS_1	0x00

#define I40E_AQ_LINK_POWER_CLASS_2	0x01

#define I40E_AQ_LINK_POWER_CLASS_3	0x02

#define I40E_AQ_LINK_POWER_CLASS_4	0x03

	u8	reserved[4];

};



I40E_CHECK_CMD_LENGTH(i40e_aqc_get_link_status);
@@ -1823,6 +1831,18 @@ enum i40e_aq_phy_reg_type { 
	I40E_AQC_PHY_REG_EXERNAL_MODULE	= 0x3

};



/* Run PHY Activity (0x0626) */

struct i40e_aqc_run_phy_activity {

	__le16  activity_id;

	u8      flags;

	u8      reserved1;

	__le32  control;

	__le32  data;

	u8      reserved2[4];

};



I40E_CHECK_CMD_LENGTH(i40e_aqc_run_phy_activity);



/* NVM Read command (indirect 0x0701)

 * NVM Erase commands (direct 0x0702)

 * NVM Update commands (indirect 0x0703)

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

+30 −57
Original line number Diff line number Diff line
@@ -55,6 +55,8 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_20G_KR2_A:

			hw->mac.type = I40E_MAC_XL710;

			break;

		case I40E_DEV_ID_KX_X722:

		case I40E_DEV_ID_QSFP_X722:

		case I40E_DEV_ID_SFP_X722:

		case I40E_DEV_ID_1G_BASE_T_X722:

		case I40E_DEV_ID_10G_BASE_T_X722:
@@ -2765,35 +2767,6 @@ i40e_status i40e_aq_erase_nvm(struct i40e_hw *hw, u8 module_pointer, 
	return status;

}



#define I40E_DEV_FUNC_CAP_SWITCH_MODE	0x01

#define I40E_DEV_FUNC_CAP_MGMT_MODE	0x02

#define I40E_DEV_FUNC_CAP_NPAR		0x03

#define I40E_DEV_FUNC_CAP_OS2BMC	0x04

#define I40E_DEV_FUNC_CAP_VALID_FUNC	0x05

#define I40E_DEV_FUNC_CAP_SRIOV_1_1	0x12

#define I40E_DEV_FUNC_CAP_VF		0x13

#define I40E_DEV_FUNC_CAP_VMDQ		0x14

#define I40E_DEV_FUNC_CAP_802_1_QBG	0x15

#define I40E_DEV_FUNC_CAP_802_1_QBH	0x16

#define I40E_DEV_FUNC_CAP_VSI		0x17

#define I40E_DEV_FUNC_CAP_DCB		0x18

#define I40E_DEV_FUNC_CAP_FCOE		0x21

#define I40E_DEV_FUNC_CAP_ISCSI		0x22

#define I40E_DEV_FUNC_CAP_RSS		0x40

#define I40E_DEV_FUNC_CAP_RX_QUEUES	0x41

#define I40E_DEV_FUNC_CAP_TX_QUEUES	0x42

#define I40E_DEV_FUNC_CAP_MSIX		0x43

#define I40E_DEV_FUNC_CAP_MSIX_VF	0x44

#define I40E_DEV_FUNC_CAP_FLOW_DIRECTOR	0x45

#define I40E_DEV_FUNC_CAP_IEEE_1588	0x46

#define I40E_DEV_FUNC_CAP_FLEX10	0xF1

#define I40E_DEV_FUNC_CAP_CEM		0xF2

#define I40E_DEV_FUNC_CAP_IWARP		0x51

#define I40E_DEV_FUNC_CAP_LED		0x61

#define I40E_DEV_FUNC_CAP_SDP		0x62

#define I40E_DEV_FUNC_CAP_MDIO		0x63

#define I40E_DEV_FUNC_CAP_WR_CSR_PROT	0x64



/**

 * i40e_parse_discover_capabilities

 * @hw: pointer to the hw struct
@@ -2832,79 +2805,79 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, 
		major_rev = cap->major_rev;



		switch (id) {

		case I40E_DEV_FUNC_CAP_SWITCH_MODE:

		case I40E_AQ_CAP_ID_SWITCH_MODE:

			p->switch_mode = number;

			break;

		case I40E_DEV_FUNC_CAP_MGMT_MODE:

		case I40E_AQ_CAP_ID_MNG_MODE:

			p->management_mode = number;

			break;

		case I40E_DEV_FUNC_CAP_NPAR:

		case I40E_AQ_CAP_ID_NPAR_ACTIVE:

			p->npar_enable = number;

			break;

		case I40E_DEV_FUNC_CAP_OS2BMC:

		case I40E_AQ_CAP_ID_OS2BMC_CAP:

			p->os2bmc = number;

			break;

		case I40E_DEV_FUNC_CAP_VALID_FUNC:

		case I40E_AQ_CAP_ID_FUNCTIONS_VALID:

			p->valid_functions = number;

			break;

		case I40E_DEV_FUNC_CAP_SRIOV_1_1:

		case I40E_AQ_CAP_ID_SRIOV:

			if (number == 1)

				p->sr_iov_1_1 = true;

			break;

		case I40E_DEV_FUNC_CAP_VF:

		case I40E_AQ_CAP_ID_VF:

			p->num_vfs = number;

			p->vf_base_id = logical_id;

			break;

		case I40E_DEV_FUNC_CAP_VMDQ:

		case I40E_AQ_CAP_ID_VMDQ:

			if (number == 1)

				p->vmdq = true;

			break;

		case I40E_DEV_FUNC_CAP_802_1_QBG:

		case I40E_AQ_CAP_ID_8021QBG:

			if (number == 1)

				p->evb_802_1_qbg = true;

			break;

		case I40E_DEV_FUNC_CAP_802_1_QBH:

		case I40E_AQ_CAP_ID_8021QBR:

			if (number == 1)

				p->evb_802_1_qbh = true;

			break;

		case I40E_DEV_FUNC_CAP_VSI:

		case I40E_AQ_CAP_ID_VSI:

			p->num_vsis = number;

			break;

		case I40E_DEV_FUNC_CAP_DCB:

		case I40E_AQ_CAP_ID_DCB:

			if (number == 1) {

				p->dcb = true;

				p->enabled_tcmap = logical_id;

				p->maxtc = phys_id;

			}

			break;

		case I40E_DEV_FUNC_CAP_FCOE:

		case I40E_AQ_CAP_ID_FCOE:

			if (number == 1)

				p->fcoe = true;

			break;

		case I40E_DEV_FUNC_CAP_ISCSI:

		case I40E_AQ_CAP_ID_ISCSI:

			if (number == 1)

				p->iscsi = true;

			break;

		case I40E_DEV_FUNC_CAP_RSS:

		case I40E_AQ_CAP_ID_RSS:

			p->rss = true;

			p->rss_table_size = number;

			p->rss_table_entry_width = logical_id;

			break;

		case I40E_DEV_FUNC_CAP_RX_QUEUES:

		case I40E_AQ_CAP_ID_RXQ:

			p->num_rx_qp = number;

			p->base_queue = phys_id;

			break;

		case I40E_DEV_FUNC_CAP_TX_QUEUES:

		case I40E_AQ_CAP_ID_TXQ:

			p->num_tx_qp = number;

			p->base_queue = phys_id;

			break;

		case I40E_DEV_FUNC_CAP_MSIX:

		case I40E_AQ_CAP_ID_MSIX:

			p->num_msix_vectors = number;

			break;

		case I40E_DEV_FUNC_CAP_MSIX_VF:

		case I40E_AQ_CAP_ID_VF_MSIX:

			p->num_msix_vectors_vf = number;

			break;

		case I40E_DEV_FUNC_CAP_FLEX10:

		case I40E_AQ_CAP_ID_FLEX10:

			if (major_rev == 1) {

				if (number == 1) {

					p->flex10_enable = true;
@@ -2920,38 +2893,38 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, 
			p->flex10_mode = logical_id;

			p->flex10_status = phys_id;

			break;

		case I40E_DEV_FUNC_CAP_CEM:

		case I40E_AQ_CAP_ID_CEM:

			if (number == 1)

				p->mgmt_cem = true;

			break;

		case I40E_DEV_FUNC_CAP_IWARP:

		case I40E_AQ_CAP_ID_IWARP:

			if (number == 1)

				p->iwarp = true;

			break;

		case I40E_DEV_FUNC_CAP_LED:

		case I40E_AQ_CAP_ID_LED:

			if (phys_id < I40E_HW_CAP_MAX_GPIO)

				p->led[phys_id] = true;

			break;

		case I40E_DEV_FUNC_CAP_SDP:

		case I40E_AQ_CAP_ID_SDP:

			if (phys_id < I40E_HW_CAP_MAX_GPIO)

				p->sdp[phys_id] = true;

			break;

		case I40E_DEV_FUNC_CAP_MDIO:

		case I40E_AQ_CAP_ID_MDIO:

			if (number == 1) {

				p->mdio_port_num = phys_id;

				p->mdio_port_mode = logical_id;

			}

			break;

		case I40E_DEV_FUNC_CAP_IEEE_1588:

		case I40E_AQ_CAP_ID_1588:

			if (number == 1)

				p->ieee_1588 = true;

			break;

		case I40E_DEV_FUNC_CAP_FLOW_DIRECTOR:

		case I40E_AQ_CAP_ID_FLOW_DIRECTOR:

			p->fd = true;

			p->fd_filters_guaranteed = number;

			p->fd_filters_best_effort = logical_id;

			break;

		case I40E_DEV_FUNC_CAP_WR_CSR_PROT:

		case I40E_AQ_CAP_ID_WSR_PROT:

			p->wr_csr_prot = (u64)number;

			p->wr_csr_prot |= (u64)logical_id << 32;

			break;

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

+7 −5
Original line number Diff line number Diff line
@@ -814,13 +814,15 @@ i40e_status i40e_get_dcb_config(struct i40e_hw *hw) 
	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))

	/* If Firmware version < v4.33 on X710/XL710, IEEE only */

	if ((hw->mac.type == I40E_MAC_XL710) &&

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

	      (hw->aq.fw_maj_ver < 4)))

		return i40e_get_ieee_dcb_config(hw);



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

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

	/* If Firmware version == v4.33 on X710/XL710, use old CEE struct */

	if ((hw->mac.type == I40E_MAC_XL710) &&

	    ((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) {

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

+2 −0
Original line number Diff line number Diff line
@@ -41,6 +41,8 @@ 
#define I40E_DEV_ID_10G_BASE_T4		0x1589

#define I40E_DEV_ID_VF			0x154C

#define I40E_DEV_ID_VF_HV		0x1571

#define I40E_DEV_ID_KX_X722		0x37CE

#define I40E_DEV_ID_QSFP_X722		0x37CF

#define I40E_DEV_ID_SFP_X722		0x37D0

#define I40E_DEV_ID_1G_BASE_T_X722	0x37D1

#define I40E_DEV_ID_10G_BASE_T_X722	0x37D2