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

Commit de6099e2 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-06

This series contains updates to i40e and i40evf.

Deepthi adds a debug message to display the MSIx vector count for hardware
capabilities.

Shannon removed the setting of debug_mask at startup to take care of an
issue where all the device capabilities getting printed when we had not
asked for it.  Moved the NVM status out of the admin queue structure,
since it should really stay with the other NVM data structures.

Akeem added the flush routine to the end of the reset flow to avoid
problems in the pass-through routines.

Jesse moves a local variable deeper into the depths of the driver
where the light is low and the context is great.  Then cleaned up
the tx_ring argument since it was not making good arguments.  Improved
performance by not "checking for FCoE" by re-ordering the FCoE checks.

Anjali adds the support for changing a VF from non-trusted to trusted
and vice-versa.

Mitch adds opcodes and structures to support RSS configuration by PF
driver on behalf of the VF driver.  Fixed how the VLAN feature flags
are set.

Kiran added defines for RSS, flow director, flexible payload and IPv6.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 58a01d4d ba6cc7f6

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

+2 −31
Original line number Diff line number Diff line
@@ -32,16 +32,6 @@ 


static void i40e_resume_aq(struct i40e_hw *hw);



/**

 * i40e_is_nvm_update_op - return true if this is an NVM update operation

 * @desc: API request descriptor

 **/

static inline bool i40e_is_nvm_update_op(struct i40e_aq_desc *desc)

{

	return (desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_erase)) ||

		(desc->opcode == cpu_to_le16(i40e_aqc_opc_nvm_update));

}



/**

 *  i40e_adminq_init_regs - Initialize AdminQ registers

 *  @hw: pointer to the hardware structure
@@ -624,7 +614,7 @@ i40e_status i40e_init_adminq(struct i40e_hw *hw) 


	/* pre-emptive resource lock release */

	i40e_aq_release_resource(hw, I40E_NVM_RESOURCE_ID, 0, NULL);

	hw->aq.nvm_release_on_done = false;

	hw->nvm_release_on_done = false;

	hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;



	ret_code = i40e_aq_set_hmc_resource_profile(hw,
@@ -1023,26 +1013,7 @@ i40e_status i40e_clean_arq_element(struct i40e_hw *hw, 
	hw->aq.arq.next_to_clean = ntc;

	hw->aq.arq.next_to_use = ntu;



	if (i40e_is_nvm_update_op(&e->desc)) {

		if (hw->aq.nvm_release_on_done) {

			i40e_release_nvm(hw);

			hw->aq.nvm_release_on_done = false;

		}



		switch (hw->nvmupd_state) {

		case I40E_NVMUPD_STATE_INIT_WAIT:

			hw->nvmupd_state = I40E_NVMUPD_STATE_INIT;

			break;



		case I40E_NVMUPD_STATE_WRITE_WAIT:

			hw->nvmupd_state = I40E_NVMUPD_STATE_WRITING;

			break;



		default:

			break;

		}

	}



	i40e_nvmupd_check_wait_event(hw, le16_to_cpu(e->desc.opcode));

clean_arq_element_out:

	/* Set pending if needed, unlock and return */

	if (pending)

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

+0 −1
Original line number Diff line number Diff line
@@ -97,7 +97,6 @@ struct i40e_adminq_info { 
	u32 fw_build;                   /* firmware build number */

	u16 api_maj_ver;                /* api major version */

	u16 api_min_ver;                /* api minor version */

	bool nvm_release_on_done;



	struct mutex asq_mutex; /* Send queue lock */

	struct mutex arq_mutex; /* Receive queue lock */

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

+3 −0
Original line number Diff line number Diff line
@@ -3080,6 +3080,9 @@ static void i40e_parse_discover_capabilities(struct i40e_hw *hw, void *buff, 
			break;

		case I40E_AQ_CAP_ID_MSIX:

			p->num_msix_vectors = number;

			i40e_debug(hw, I40E_DEBUG_INIT,

				   "HW Capability: MSIX vector count = %d\n",

				   p->num_msix_vectors);

			break;

		case I40E_AQ_CAP_ID_VF_MSIX:

			p->num_msix_vectors_vf = number;

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

+1 −11
Original line number Diff line number Diff line 
/*******************************************************************************

 *

 * Intel Ethernet Controller XL710 Family Linux Driver

 * Copyright(c) 2013 - 2015 Intel Corporation.

 * Copyright(c) 2013 - 2016 Intel Corporation.

 *

 * This program is free software; you can redistribute it and/or modify it

 * under the terms and conditions of the GNU General Public License,
@@ -37,16 +37,6 @@ 
#include "i40e.h"

#include "i40e_fcoe.h"



/**

 * i40e_rx_is_fcoe - returns true if the rx packet type is FCoE

 * @ptype: the packet type field from rx descriptor write-back

 **/

static inline bool i40e_rx_is_fcoe(u16 ptype)

{

	return (ptype >= I40E_RX_PTYPE_L2_FCOE_PAY3) &&

	       (ptype <= I40E_RX_PTYPE_L2_FCOE_VFT_FCOTHER);

}



/**

 * i40e_fcoe_sof_is_class2 - returns true if this is a FC Class 2 SOF

 * @sof: the FCoE start of frame delimiter

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

+2 −2
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 2

#define DRV_VERSION_BUILD 5

#define DRV_VERSION __stringify(DRV_VERSION_MAJOR) "." \

	     __stringify(DRV_VERSION_MINOR) "." \

	     __stringify(DRV_VERSION_BUILD)    DRV_KERN
@@ -8438,7 +8438,6 @@ static int i40e_sw_init(struct i40e_pf *pf) 


	pf->msg_enable = netif_msg_init(I40E_DEFAULT_MSG_ENABLE,

				(NETIF_MSG_DRV|NETIF_MSG_PROBE|NETIF_MSG_LINK));

	pf->hw.debug_mask = pf->msg_enable | I40E_DEBUG_DIAG;

	if (debug != -1 && debug != I40E_DEFAULT_MSG_ENABLE) {

		if (I40E_DEBUG_USER & debug)

			pf->hw.debug_mask = debug;
@@ -9070,6 +9069,7 @@ static const struct net_device_ops i40e_netdev_ops = { 
	.ndo_get_vf_config	= i40e_ndo_get_vf_config,

	.ndo_set_vf_link_state	= i40e_ndo_set_vf_link_state,

	.ndo_set_vf_spoofchk	= i40e_ndo_set_vf_spoofchk,

	.ndo_set_vf_trust	= i40e_ndo_set_vf_trust,

#if IS_ENABLED(CONFIG_VXLAN)

	.ndo_add_vxlan_port	= i40e_add_vxlan_port,

	.ndo_del_vxlan_port	= i40e_del_vxlan_port,