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

Commit 2995aea5 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-04-27

This series contains updates to i40e and i40evf.

Alex Duyck cleans up the feature flags since they are becoming pretty
"massive", the primary change being that we now build our features list
around hw_encap_features.  Added support for IPIP and SIT offloads,
which should improvement in throughput for IPIP and SIT tunnels with
the offload enabled.

Mitch adds support for configuring RSS on behalf of the VFs, which removes
the burden of dealing with different hardware interfaces from the VF
drivers and improves future compatibility.  Fix to ensure that we do not
panic by checking that the vsi_res pointer is valid before dereferencing
it, after which we can drink beer and eat peanuts.

Shannon does come housekeeping in i40e_add_fdir_ethtool() in preparation
for more cloud filter work.  Added flexibility to the nvmupdate
facility by adding the ability to specify an AQ event opcode to wait on
after Exec_AQ request.

Michal adds device capability which defines if an update is available and
if a security check is needed during the update process.

Kamil just adds a device id to support X722 QSFP+ device.

Greg fixes an issue where a mirror rule ID may be zero, so do not return
invalid parameter when the user passes in a zero for a rule ID.  Adds
support to steer packets to VSIs by VLAN tag alone while being in
promiscuous mode for multicast and unicast MAC addresses.

Jesse fixes the driver from offloading the VLAN tag into the skb any
time there was a VLAN tag and the hardware stripping was enabled, to
making sure it is enabled before put_tag.

v2: Dropped patch 8 ("i40e: Allow user to change input set mask for flow
    director") while Kiran reworks a more generalized solution based
    on feedback from David Miller.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 501e7ef5 47d34839

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

+1 −0
Original line number Diff line number Diff line
@@ -202,6 +202,7 @@ struct i40e_lump_tracking { 


#define I40E_HKEY_ARRAY_SIZE ((I40E_PFQF_HKEY_MAX_INDEX + 1) * 4)

#define I40E_HLUT_ARRAY_SIZE ((I40E_PFQF_HLUT_MAX_INDEX + 1) * 4)

#define I40E_VF_HLUT_ARRAY_SIZE ((I40E_VFQF_HLUT1_MAX_INDEX + 1) * 4)



enum i40e_fd_stat_idx {

	I40E_FD_STAT_ATR,

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

+1 −0
Original line number Diff line number Diff line
@@ -429,6 +429,7 @@ struct i40e_aqc_list_capabilities_element_resp { 
#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_NVM_MGMT		0x0080

#define I40E_AQ_CAP_ID_FLEX10		0x00F1

#define I40E_AQ_CAP_ID_CEM		0x00F2

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

+78 −4
Original line number Diff line number Diff line
@@ -61,6 +61,7 @@ static i40e_status i40e_set_mac_type(struct i40e_hw *hw) 
		case I40E_DEV_ID_1G_BASE_T_X722:

		case I40E_DEV_ID_10G_BASE_T_X722:

		case I40E_DEV_ID_SFP_I_X722:

		case I40E_DEV_ID_QSFP_I_X722:

			hw->mac.type = I40E_MAC_X722;

			break;

		default:
@@ -2037,6 +2038,76 @@ i40e_status i40e_aq_set_vsi_multicast_promiscuous(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_aq_set_vsi_mc_promisc_on_vlan

 * @hw: pointer to the hw struct

 * @seid: vsi number

 * @enable: set MAC L2 layer unicast promiscuous enable/disable for a given VLAN

 * @vid: The VLAN tag filter - capture any multicast packet with this VLAN tag

 * @cmd_details: pointer to command details structure or NULL

 **/

enum i40e_status_code i40e_aq_set_vsi_mc_promisc_on_vlan(struct i40e_hw *hw,

							 u16 seid, bool enable,

							 u16 vid,

				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_set_vsi_promiscuous_modes *cmd =

		(struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw;

	enum i40e_status_code status;

	u16 flags = 0;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_set_vsi_promiscuous_modes);



	if (enable)

		flags |= I40E_AQC_SET_VSI_PROMISC_MULTICAST;



	cmd->promiscuous_flags = cpu_to_le16(flags);

	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_MULTICAST);

	cmd->seid = cpu_to_le16(seid);

	cmd->vlan_tag = cpu_to_le16(vid | I40E_AQC_SET_VSI_VLAN_VALID);



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



	return status;

}



/**

 * i40e_aq_set_vsi_uc_promisc_on_vlan

 * @hw: pointer to the hw struct

 * @seid: vsi number

 * @enable: set MAC L2 layer unicast promiscuous enable/disable for a given VLAN

 * @vid: The VLAN tag filter - capture any unicast packet with this VLAN tag

 * @cmd_details: pointer to command details structure or NULL

 **/

enum i40e_status_code i40e_aq_set_vsi_uc_promisc_on_vlan(struct i40e_hw *hw,

							 u16 seid, bool enable,

							 u16 vid,

				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aqc_set_vsi_promiscuous_modes *cmd =

		(struct i40e_aqc_set_vsi_promiscuous_modes *)&desc.params.raw;

	enum i40e_status_code status;

	u16 flags = 0;



	i40e_fill_default_direct_cmd_desc(&desc,

					  i40e_aqc_opc_set_vsi_promiscuous_modes);



	if (enable)

		flags |= I40E_AQC_SET_VSI_PROMISC_UNICAST;



	cmd->promiscuous_flags = cpu_to_le16(flags);

	cmd->valid_flags = cpu_to_le16(I40E_AQC_SET_VSI_PROMISC_UNICAST);

	cmd->seid = cpu_to_le16(seid);

	cmd->vlan_tag = cpu_to_le16(vid | I40E_AQC_SET_VSI_VLAN_VALID);



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



	return status;

}



/**

 * i40e_aq_set_vsi_broadcast

 * @hw: pointer to the hw struct
@@ -2667,10 +2738,7 @@ i40e_status i40e_aq_delete_mirrorrule(struct i40e_hw *hw, u16 sw_seid, 
			u16 *rules_used, u16 *rules_free)

{

	/* Rule ID has to be valid except rule_type: INGRESS VLAN mirroring */

	if (rule_type != I40E_AQC_MIRROR_RULE_TYPE_VLAN) {

		if (!rule_id)

			return I40E_ERR_PARAM;

	} else {

	if (rule_type == I40E_AQC_MIRROR_RULE_TYPE_VLAN) {

		/* count and mr_list shall be valid for rule_type INGRESS VLAN

		 * mirroring. For other rule_type, count and rule_type should

		 * not matter.
@@ -3138,6 +3206,12 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, 
			p->wr_csr_prot = (u64)number;

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

			break;

		case I40E_AQ_CAP_ID_NVM_MGMT:

			if (number & I40E_NVM_MGMT_SEC_REV_DISABLED)

				p->sec_rev_disabled = true;

			if (number & I40E_NVM_MGMT_UPDATE_DISABLED)

				p->update_disabled = true;

			break;

		default:

			break;

		}

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

+1 −0
Original line number Diff line number Diff line
@@ -45,6 +45,7 @@ 
#define I40E_DEV_ID_1G_BASE_T_X722	0x37D1

#define I40E_DEV_ID_10G_BASE_T_X722	0x37D2

#define I40E_DEV_ID_SFP_I_X722		0x37D3

#define I40E_DEV_ID_QSFP_I_X722		0x37D4



#define i40e_is_40G_device(d)		((d) == I40E_DEV_ID_QSFP_A  || \

					 (d) == I40E_DEV_ID_QSFP_B  || \

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

+7 −5
Original line number Diff line number Diff line
@@ -2506,7 +2506,6 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 


	if (!vsi)

		return -EINVAL;



	pf = vsi->back;



	if (!(pf->flags & I40E_FLAG_FD_SB_ENABLED))
@@ -2564,15 +2563,18 @@ static int i40e_add_fdir_ethtool(struct i40e_vsi *vsi, 
	input->src_ip[0] = fsp->h_u.tcp_ip4_spec.ip4dst;



	if (ntohl(fsp->m_ext.data[1])) {

		if (ntohl(fsp->h_ext.data[1]) >= pf->num_alloc_vfs) {

			netif_info(pf, drv, vsi->netdev, "Invalid VF id\n");

		vf_id = ntohl(fsp->h_ext.data[1]);

		if (vf_id >= pf->num_alloc_vfs) {

			netif_info(pf, drv, vsi->netdev,

				   "Invalid VF id %d\n", vf_id);

			goto free_input;

		}

		vf_id = ntohl(fsp->h_ext.data[1]);

		/* Find vsi id from vf id and override dest vsi */

		input->dest_vsi = pf->vf[vf_id].lan_vsi_id;

		if (input->q_index >= pf->vf[vf_id].num_queue_pairs) {

			netif_info(pf, drv, vsi->netdev, "Invalid queue id\n");

			netif_info(pf, drv, vsi->netdev,

				   "Invalid queue id %d for VF %d\n",

				   input->q_index, vf_id);

			goto free_input;

		}

	}