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

Commit 8cd14ccb 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-05-01

This series contains updates to i40e and i40evf.

The theme of this series is code reduction, with several code cleanups in
this series.  Starting with Neerav's removal of the code that implemented
the HMC AQ APIs and calls, since they are now obsolete and not supported
by firmware.

Anjali changes the default of VFs to make sure they are not trusted or
privileged until its explicitly set for trust through the new NDO op
interface.  Also limited the number of MAC and VLAN addresses a VF can
add if it is untrusted/privileged.

Carolyn syncs the VF code for the changes made to the PF for the RSS
hash tuple settings, which ends up cleaning up much of the existing code.

Jesse cleans up compiler warnings which were found with gcc's W=2 option.
Then removed duplicate code, especially since only one copy was actually
being used.

Jacob addresses an issue which was found when testing GCC 6's which
happens to produce new warnings when you left shift a signed value
beyond the storage sizeof the type.  The converts i40e & i40evf to use
the BIT() macro more consistently.

Alex actually bucks the trend of code removal by adding support for
both drivers to use GSO_PARTIAL so that segmentation of frames with
checksums enabled in outer headers is supported.  Fortunately it does
not take much to add this support!
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 0970f5b3 1c7b4a23

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

+1 −1
Original line number Diff line number Diff line
@@ -554,7 +554,7 @@ struct i40e_vsi { 
	u16 num_queue_pairs; /* Used tx and rx pairs */

	u16 num_desc;

	enum i40e_vsi_type type;  /* VSI type, e.g., LAN, FCoE, etc */

	u16 vf_id;		/* Virtual function ID for SRIOV VSIs */

	s16 vf_id;		/* Virtual function ID for SRIOV VSIs */



	struct i40e_tc_configuration tc_config;

	struct i40e_aqc_vsi_properties_data info;

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

+0 −4
Original line number Diff line number Diff line
@@ -617,10 +617,6 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 
	hw->nvm_release_on_done = false;

	hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;



	ret_code = i40e_aq_set_hmc_resource_profile(hw,

						    I40E_HMC_PROFILE_DEFAULT,

						    0,

						    NULL);

	ret_code = 0;



	/* success! */

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

+25 −53
Original line number Diff line number Diff line
@@ -78,17 +78,17 @@ struct i40e_aq_desc { 
#define I40E_AQ_FLAG_EI_SHIFT	14

#define I40E_AQ_FLAG_FE_SHIFT	15



#define I40E_AQ_FLAG_DD		(1 << I40E_AQ_FLAG_DD_SHIFT)  /* 0x1    */

#define I40E_AQ_FLAG_CMP	(1 << I40E_AQ_FLAG_CMP_SHIFT) /* 0x2    */

#define I40E_AQ_FLAG_ERR	(1 << I40E_AQ_FLAG_ERR_SHIFT) /* 0x4    */

#define I40E_AQ_FLAG_VFE	(1 << I40E_AQ_FLAG_VFE_SHIFT) /* 0x8    */

#define I40E_AQ_FLAG_LB		(1 << I40E_AQ_FLAG_LB_SHIFT)  /* 0x200  */

#define I40E_AQ_FLAG_RD		(1 << I40E_AQ_FLAG_RD_SHIFT)  /* 0x400  */

#define I40E_AQ_FLAG_VFC	(1 << I40E_AQ_FLAG_VFC_SHIFT) /* 0x800  */

#define I40E_AQ_FLAG_BUF	(1 << I40E_AQ_FLAG_BUF_SHIFT) /* 0x1000 */

#define I40E_AQ_FLAG_SI		(1 << I40E_AQ_FLAG_SI_SHIFT)  /* 0x2000 */

#define I40E_AQ_FLAG_EI		(1 << I40E_AQ_FLAG_EI_SHIFT)  /* 0x4000 */

#define I40E_AQ_FLAG_FE		(1 << I40E_AQ_FLAG_FE_SHIFT)  /* 0x8000 */

#define I40E_AQ_FLAG_DD		BIT(I40E_AQ_FLAG_DD_SHIFT)  /* 0x1    */

#define I40E_AQ_FLAG_CMP	BIT(I40E_AQ_FLAG_CMP_SHIFT) /* 0x2    */

#define I40E_AQ_FLAG_ERR	BIT(I40E_AQ_FLAG_ERR_SHIFT) /* 0x4    */

#define I40E_AQ_FLAG_VFE	BIT(I40E_AQ_FLAG_VFE_SHIFT) /* 0x8    */

#define I40E_AQ_FLAG_LB		BIT(I40E_AQ_FLAG_LB_SHIFT)  /* 0x200  */

#define I40E_AQ_FLAG_RD		BIT(I40E_AQ_FLAG_RD_SHIFT)  /* 0x400  */

#define I40E_AQ_FLAG_VFC	BIT(I40E_AQ_FLAG_VFC_SHIFT) /* 0x800  */

#define I40E_AQ_FLAG_BUF	BIT(I40E_AQ_FLAG_BUF_SHIFT) /* 0x1000 */

#define I40E_AQ_FLAG_SI		BIT(I40E_AQ_FLAG_SI_SHIFT)  /* 0x2000 */

#define I40E_AQ_FLAG_EI		BIT(I40E_AQ_FLAG_EI_SHIFT)  /* 0x4000 */

#define I40E_AQ_FLAG_FE		BIT(I40E_AQ_FLAG_FE_SHIFT)  /* 0x8000 */



/* error codes */

enum i40e_admin_queue_err {
@@ -205,10 +205,6 @@ enum i40e_admin_queue_opc { 
	i40e_aqc_opc_resume_port_tx				= 0x041C,

	i40e_aqc_opc_configure_partition_bw			= 0x041D,



	/* hmc */

	i40e_aqc_opc_query_hmc_resource_profile	= 0x0500,

	i40e_aqc_opc_set_hmc_resource_profile	= 0x0501,



	/* phy commands*/

	i40e_aqc_opc_get_phy_abilities		= 0x0600,

	i40e_aqc_opc_set_phy_config		= 0x0601,
@@ -1586,27 +1582,6 @@ struct i40e_aqc_configure_partition_bw_data { 


I40E_CHECK_STRUCT_LEN(0x22, i40e_aqc_configure_partition_bw_data);



/* Get and set the active HMC resource profile and status.

 * (direct 0x0500) and (direct 0x0501)

 */

struct i40e_aq_get_set_hmc_resource_profile {

	u8	pm_profile;

	u8	pe_vf_enabled;

	u8	reserved[14];

};



I40E_CHECK_CMD_LENGTH(i40e_aq_get_set_hmc_resource_profile);



enum i40e_aq_hmc_profile {

	/* I40E_HMC_PROFILE_NO_CHANGE    = 0, reserved */

	I40E_HMC_PROFILE_DEFAULT	= 1,

	I40E_HMC_PROFILE_FAVOR_VF	= 2,

	I40E_HMC_PROFILE_EQUAL		= 3,

};



#define I40E_AQ_GET_HMC_RESOURCE_PROFILE_PM_MASK	0xF

#define I40E_AQ_GET_HMC_RESOURCE_PROFILE_COUNT_MASK	0x3F



/* Get PHY Abilities (indirect 0x0600) uses the generic indirect struct */



/* set in param0 for get phy abilities to report qualified modules */
@@ -1653,11 +1628,11 @@ enum i40e_aq_phy_type { 


enum i40e_aq_link_speed {

	I40E_LINK_SPEED_UNKNOWN	= 0,

	I40E_LINK_SPEED_100MB	= (1 << I40E_LINK_SPEED_100MB_SHIFT),

	I40E_LINK_SPEED_1GB	= (1 << I40E_LINK_SPEED_1000MB_SHIFT),

	I40E_LINK_SPEED_10GB	= (1 << I40E_LINK_SPEED_10GB_SHIFT),

	I40E_LINK_SPEED_40GB	= (1 << I40E_LINK_SPEED_40GB_SHIFT),

	I40E_LINK_SPEED_20GB	= (1 << I40E_LINK_SPEED_20GB_SHIFT)

	I40E_LINK_SPEED_100MB	= BIT(I40E_LINK_SPEED_100MB_SHIFT),

	I40E_LINK_SPEED_1GB	= BIT(I40E_LINK_SPEED_1000MB_SHIFT),

	I40E_LINK_SPEED_10GB	= BIT(I40E_LINK_SPEED_10GB_SHIFT),

	I40E_LINK_SPEED_40GB	= BIT(I40E_LINK_SPEED_40GB_SHIFT),

	I40E_LINK_SPEED_20GB	= BIT(I40E_LINK_SPEED_20GB_SHIFT)

};



struct i40e_aqc_module_desc {
@@ -1928,9 +1903,9 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_nvm_config_write); 
/* Used for 0x0704 as well as for 0x0705 commands */

#define I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT		1

#define I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_MASK \

				(1 << I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT)

				BIT(I40E_AQ_ANVM_FEATURE_OR_IMMEDIATE_SHIFT)

#define I40E_AQ_ANVM_FEATURE		0

#define I40E_AQ_ANVM_IMMEDIATE_FIELD	(1 << FEATURE_OR_IMMEDIATE_SHIFT)

#define I40E_AQ_ANVM_IMMEDIATE_FIELD	BIT(FEATURE_OR_IMMEDIATE_SHIFT)

struct i40e_aqc_nvm_config_data_feature {

	__le16 feature_id;

#define I40E_AQ_ANVM_FEATURE_OPTION_OEM_ONLY		0x01
@@ -2227,13 +2202,11 @@ I40E_CHECK_STRUCT_LEN(0x20, i40e_aqc_get_cee_dcb_cfg_resp); 
 */

struct i40e_aqc_lldp_set_local_mib {

#define SET_LOCAL_MIB_AC_TYPE_DCBX_SHIFT	0

#define SET_LOCAL_MIB_AC_TYPE_DCBX_MASK	(1 << SET_LOCAL_MIB_AC_TYPE_DCBX_SHIFT)

#define SET_LOCAL_MIB_AC_TYPE_DCBX_MASK	(1 << \

					SET_LOCAL_MIB_AC_TYPE_DCBX_SHIFT)

#define SET_LOCAL_MIB_AC_TYPE_DCBX_MASK	BIT(SET_LOCAL_MIB_AC_TYPE_DCBX_SHIFT)

#define SET_LOCAL_MIB_AC_TYPE_LOCAL_MIB	0x0

#define SET_LOCAL_MIB_AC_TYPE_NON_WILLING_APPS_SHIFT	(1)

#define SET_LOCAL_MIB_AC_TYPE_NON_WILLING_APPS_MASK	(1 << \

				SET_LOCAL_MIB_AC_TYPE_NON_WILLING_APPS_SHIFT)

#define SET_LOCAL_MIB_AC_TYPE_NON_WILLING_APPS_MASK \

			BIT(SET_LOCAL_MIB_AC_TYPE_NON_WILLING_APPS_SHIFT)

#define SET_LOCAL_MIB_AC_TYPE_NON_WILLING_APPS		0x1

	u8	type;

	u8	reserved0;
@@ -2251,7 +2224,7 @@ I40E_CHECK_CMD_LENGTH(i40e_aqc_lldp_set_local_mib); 
struct i40e_aqc_lldp_stop_start_specific_agent {

#define I40E_AQC_START_SPECIFIC_AGENT_SHIFT	0

#define I40E_AQC_START_SPECIFIC_AGENT_MASK \

				(1 << I40E_AQC_START_SPECIFIC_AGENT_SHIFT)

				BIT(I40E_AQC_START_SPECIFIC_AGENT_SHIFT)

	u8	command;

	u8	reserved[15];

};
@@ -2304,7 +2277,7 @@ struct i40e_aqc_del_udp_tunnel_completion { 
I40E_CHECK_CMD_LENGTH(i40e_aqc_del_udp_tunnel_completion);



struct i40e_aqc_get_set_rss_key {

#define I40E_AQC_SET_RSS_KEY_VSI_VALID		(0x1 << 15)

#define I40E_AQC_SET_RSS_KEY_VSI_VALID		BIT(15)

#define I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT	0

#define I40E_AQC_SET_RSS_KEY_VSI_ID_MASK	(0x3FF << \

					I40E_AQC_SET_RSS_KEY_VSI_ID_SHIFT)
@@ -2324,14 +2297,13 @@ struct i40e_aqc_get_set_rss_key_data { 
I40E_CHECK_STRUCT_LEN(0x34, i40e_aqc_get_set_rss_key_data);



struct  i40e_aqc_get_set_rss_lut {

#define I40E_AQC_SET_RSS_LUT_VSI_VALID		(0x1 << 15)

#define I40E_AQC_SET_RSS_LUT_VSI_VALID		BIT(15)

#define I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT	0

#define I40E_AQC_SET_RSS_LUT_VSI_ID_MASK	(0x3FF << \

					I40E_AQC_SET_RSS_LUT_VSI_ID_SHIFT)

	__le16	vsi_id;

#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT	0

#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK	(0x1 << \

					I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT)

#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_MASK	BIT(I40E_AQC_SET_RSS_LUT_TABLE_TYPE_SHIFT)



#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_VSI	0

#define I40E_AQC_SET_RSS_LUT_TABLE_TYPE_PF	1

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

+0 −30
Original line number Diff line number Diff line
@@ -2854,36 +2854,6 @@ i40e_status i40e_aq_debug_write_register(struct i40e_hw *hw, 
	return status;

}



/**

 * i40e_aq_set_hmc_resource_profile

 * @hw: pointer to the hw struct

 * @profile: type of profile the HMC is to be set as

 * @pe_vf_enabled_count: the number of PE enabled VFs the system has

 * @cmd_details: pointer to command details structure or NULL

 *

 * set the HMC profile of the device.

 **/

i40e_status i40e_aq_set_hmc_resource_profile(struct i40e_hw *hw,

				enum i40e_aq_hmc_profile profile,

				u8 pe_vf_enabled_count,

				struct i40e_asq_cmd_details *cmd_details)

{

	struct i40e_aq_desc desc;

	struct i40e_aq_get_set_hmc_resource_profile *cmd =

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

	i40e_status status;



	i40e_fill_default_direct_cmd_desc(&desc,

					i40e_aqc_opc_set_hmc_resource_profile);



	cmd->pm_profile = (u8)profile;

	cmd->pe_vf_enabled = pe_vf_enabled_count;



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



	return status;

}



/**

 * i40e_aq_request_resource

 * @hw: pointer to the hw struct

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

+16 −21
Original line number Diff line number Diff line
@@ -46,7 +46,7 @@ static const char i40e_driver_string[] = 


#define DRV_VERSION_MAJOR 1

#define DRV_VERSION_MINOR 5

#define DRV_VERSION_BUILD 5

#define DRV_VERSION_BUILD 10

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -91,6 +91,7 @@ static const struct pci_device_id i40e_pci_tbl[] = { 
	{PCI_VDEVICE(INTEL, I40E_DEV_ID_1G_BASE_T_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_10G_BASE_T_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_SFP_I_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_QSFP_I_X722), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2), 0},

	{PCI_VDEVICE(INTEL, I40E_DEV_ID_20G_KR2_A), 0},

	/* required last entry */
@@ -396,24 +397,6 @@ static void i40e_tx_timeout(struct net_device *netdev) 
	pf->tx_timeout_recovery_level++;

}



/**

 * i40e_release_rx_desc - Store the new tail and head values

 * @rx_ring: ring to bump

 * @val: new head index

 **/

static inline void i40e_release_rx_desc(struct i40e_ring *rx_ring, u32 val)

{

	rx_ring->next_to_use = val;



	/* Force memory writes to complete before letting h/w

	 * know there are new descriptors to fetch.  (Only

	 * applicable for weak-ordered memory model archs,

	 * such as IA-64).

	 */

	wmb();

	writel(val, rx_ring->tail);

}



/**

 * i40e_get_vsi_stats_struct - Get System Network Statistics

 * @vsi: the VSI we care about
@@ -2098,6 +2081,12 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi) 
		}

	}



	/* if the VF is not trusted do not do promisc */

	if ((vsi->type == I40E_VSI_SRIOV) && !pf->vf[vsi->vf_id].trusted) {

		clear_bit(__I40E_FILTER_OVERFLOW_PROMISC, &vsi->state);

		goto out;

	}



	/* check for changes in promiscuous modes */

	if (changed_flags & IFF_ALLMULTI) {

		bool cur_multipromisc;
@@ -9141,20 +9130,25 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
				   NETIF_F_TSO_ECN		|

				   NETIF_F_TSO6			|

				   NETIF_F_GSO_GRE		|

				   NETIF_F_GSO_GRE_CSUM		|

				   NETIF_F_GSO_IPIP		|

				   NETIF_F_GSO_SIT		|

				   NETIF_F_GSO_UDP_TUNNEL	|

				   NETIF_F_GSO_UDP_TUNNEL_CSUM	|

				   NETIF_F_GSO_PARTIAL		|

				   NETIF_F_SCTP_CRC		|

				   NETIF_F_RXHASH		|

				   NETIF_F_RXCSUM		|

				   0;



	if (!(pf->flags & I40E_FLAG_OUTER_UDP_CSUM_CAPABLE))

		netdev->hw_enc_features ^= NETIF_F_GSO_UDP_TUNNEL_CSUM;

		netdev->gso_partial_features |= NETIF_F_GSO_UDP_TUNNEL_CSUM;



	netdev->gso_partial_features |= NETIF_F_GSO_GRE_CSUM;



	/* record features VLANs can make use of */

	netdev->vlan_features |= netdev->hw_enc_features;

	netdev->vlan_features |= netdev->hw_enc_features |

				 NETIF_F_TSO_MANGLEID;



	if (!(pf->flags & I40E_FLAG_MFP_ENABLED))

		netdev->hw_features |= NETIF_F_NTUPLE;
@@ -9164,6 +9158,7 @@ static int i40e_config_netdev(struct i40e_vsi *vsi) 
			       NETIF_F_HW_VLAN_CTAG_RX;



	netdev->features |= netdev->hw_features | NETIF_F_HW_VLAN_CTAG_FILTER;

	netdev->hw_enc_features |= NETIF_F_TSO_MANGLEID;



	if (vsi->type == I40E_VSI_MAIN) {

		SET_NETDEV_DEV(netdev, &pf->pdev->dev);