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

Commit 205ed44e 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 2017-03-27

This series contains updates to i40e and i40evf only.

Alex updates the driver code so that we can do bulk updates of the page
reference count instead of just incrementing it by one reference at a
time.  Fixed an issue where we were not resetting skb back to NULL when
we have freed it.  Cleaned up the i40e_process_skb_fields() to align with
other Intel drivers.  Removed FCoE code, since it is not supported in any
of the Fortville/Fortpark hardware, so there is not much point of carrying
the code around, especially if it is broken and untested.

Harshitha fixes a bug in the driver where the calculation of the RSS size
was not taking into account the number of traffic classes enabled.

Robert fixes a potential race condition during VF reset by eliminating
IOMMU DMAR Faults caused by VF hardware and when the OS initiates a VF
reset and before the reset is finished we modify the VF's settings.

Bimmy removes a delay that is no longer needed, since it was only needed
for preproduction hardware.

Colin King fixes null pointer dereference, where VSI was being
dereferenced before the VSI NULL check.

Jake fixes an issue with the recent addition of the "client code" to the
driver, where we attempt to use an uninitialized variable, so correctly
initialize the params variable by calling i40e_client_get_params().

v2: dropped patch 5 of the original series from Carolyn since we need
    more documentation and reason why the added delay, so Carolyn is
    taking the time to update the patch before we re-submit it for
    kernel inclusion.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 402a5bc4 7be147dc

drivers/net/ethernet/intel/Kconfig

+0 −11
Original line number Diff line number Diff line
@@ -235,17 +235,6 @@ config I40E_DCB 


	  If unsure, say N.



config I40E_FCOE

	bool "Fibre Channel over Ethernet (FCoE)"

	default n

	depends on I40E && DCB && FCOE

	---help---

	  Say Y here if you want to use Fibre Channel over Ethernet (FCoE)

	  in the driver. This will create new netdev for exclusive FCoE

	  use with XL710 FCoE offloads enabled.



	  If unsure, say N.



config I40EVF

	tristate "Intel(R) XL710 X710 Virtual Function Ethernet support"

	depends on PCI_MSI

drivers/net/ethernet/intel/i40e/Makefile

+0 −1
Original line number Diff line number Diff line
@@ -45,4 +45,3 @@ i40e-objs := i40e_main.o \ 
	i40e_virtchnl_pf.o



i40e-$(CONFIG_I40E_DCB) += i40e_dcb.o i40e_dcb_nl.o
 
i40e-$(CONFIG_I40E_FCOE) += i40e_fcoe.o

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

+0 −62
Original line number Diff line number Diff line
@@ -56,9 +56,6 @@ 
#include <linux/ptp_clock_kernel.h>

#include "i40e_type.h"

#include "i40e_prototype.h"

#ifdef I40E_FCOE

#include "i40e_fcoe.h"

#endif

#include "i40e_client.h"

#include "i40e_virtchnl.h"

#include "i40e_virtchnl_pf.h"
@@ -85,10 +82,6 @@ 
		(((pf)->flags & I40E_FLAG_128_QP_RSS_CAPABLE) ? 128 : 64)

#define I40E_FDIR_RING			0

#define I40E_FDIR_RING_COUNT		32

#ifdef I40E_FCOE

#define I40E_DEFAULT_FCOE		8 /* default number of QPs for FCoE */

#define I40E_MINIMUM_FCOE		1 /* minimum number of QPs for FCoE */

#endif /* I40E_FCOE */

#define I40E_MAX_AQ_BUF_SIZE		4096

#define I40E_AQ_LEN			256

#define I40E_AQ_WORK_LIMIT		66 /* max number of VFs + a little */
@@ -347,10 +340,6 @@ struct i40e_pf { 
	u16 num_vmdq_msix;         /* num queue vectors per vmdq pool */

	u16 num_req_vfs;           /* num VFs requested for this VF */

	u16 num_vf_qps;            /* num queue pairs per VF */

#ifdef I40E_FCOE

	u16 num_fcoe_qps;          /* num fcoe queues this PF has set up */

	u16 num_fcoe_msix;         /* num queue vectors per fcoe pool */

#endif /* I40E_FCOE */

	u16 num_lan_qps;           /* num lan queues this PF has set up */

	u16 num_lan_msix;          /* num queue vectors for the base PF vsi */

	u16 num_fdsb_msix;         /* num queue vectors for sideband Fdir */
@@ -411,9 +400,6 @@ struct i40e_pf { 
#define I40E_FLAG_FDIR_REQUIRES_REINIT		BIT_ULL(8)

#define I40E_FLAG_NEED_LINK_UPDATE		BIT_ULL(9)

#define I40E_FLAG_IWARP_ENABLED			BIT_ULL(10)

#ifdef I40E_FCOE

#define I40E_FLAG_FCOE_ENABLED			BIT_ULL(11)

#endif /* I40E_FCOE */

#define I40E_FLAG_CLEAN_ADMINQ			BIT_ULL(14)

#define I40E_FLAG_FILTER_SYNC			BIT_ULL(15)

#define I40E_FLAG_SERVICE_CLIENT_REQUESTED	BIT_ULL(16)
@@ -461,10 +447,6 @@ struct i40e_pf { 
	 */

	u64 hw_disabled_flags;



#ifdef I40E_FCOE

	struct i40e_fcoe fcoe;



#endif /* I40E_FCOE */

	struct i40e_client_instance *cinst;

	bool stat_offsets_loaded;

	struct i40e_hw_port_stats stats;
@@ -520,8 +502,6 @@ struct i40e_pf { 
	 */

	u16 dcbx_cap;



	u32 fcoe_hmc_filt_num;

	u32 fcoe_hmc_cntx_num;

	struct i40e_filter_control_settings filter_settings;



	struct ptp_clock *ptp_clock;
@@ -641,11 +621,6 @@ struct i40e_vsi { 
	struct rtnl_link_stats64 net_stats_offsets;

	struct i40e_eth_stats eth_stats;

	struct i40e_eth_stats eth_stats_offsets;

#ifdef I40E_FCOE

	struct i40e_fcoe_stats fcoe_stats;

	struct i40e_fcoe_stats fcoe_stats_offsets;

	bool fcoe_stat_offsets_loaded;

#endif

	u32 tx_restart;

	u32 tx_busy;

	u64 tx_linearize;
@@ -918,11 +893,6 @@ int i40e_sync_vsi_filters(struct i40e_vsi *vsi); 
struct i40e_vsi *i40e_vsi_setup(struct i40e_pf *pf, u8 type,

				u16 uplink, u32 param1);

int i40e_vsi_release(struct i40e_vsi *vsi);

#ifdef I40E_FCOE

void i40e_vsi_setup_queue_map(struct i40e_vsi *vsi,

			      struct i40e_vsi_context *ctxt,

			      u8 enabled_tc, bool is_add);

#endif

void i40e_service_event_schedule(struct i40e_pf *pf);

void i40e_notify_client_of_vf_msg(struct i40e_vsi *vsi, u32 vf_id,

				  u8 *msg, u16 len);
@@ -982,20 +952,7 @@ static inline void i40e_irq_dynamic_enable(struct i40e_vsi *vsi, int vector) 


void i40e_irq_dynamic_disable_icr0(struct i40e_pf *pf);

void i40e_irq_dynamic_enable_icr0(struct i40e_pf *pf, bool clearpba);

#ifdef I40E_FCOE

void i40e_get_netdev_stats_struct(struct net_device *netdev,

				  struct rtnl_link_stats64 *storage);

int i40e_set_mac(struct net_device *netdev, void *p);

void i40e_set_rx_mode(struct net_device *netdev);

#endif

int i40e_ioctl(struct net_device *netdev, struct ifreq *ifr, int cmd);

#ifdef I40E_FCOE

void i40e_tx_timeout(struct net_device *netdev);

int i40e_vlan_rx_add_vid(struct net_device *netdev,

			 __always_unused __be16 proto, u16 vid);

int i40e_vlan_rx_kill_vid(struct net_device *netdev,

			  __always_unused __be16 proto, u16 vid);

#endif

int i40e_open(struct net_device *netdev);

int i40e_close(struct net_device *netdev);

int i40e_vsi_open(struct i40e_vsi *vsi);
@@ -1009,25 +966,6 @@ struct i40e_mac_filter *i40e_add_mac_filter(struct i40e_vsi *vsi, 
int i40e_del_mac_filter(struct i40e_vsi *vsi, const u8 *macaddr);

bool i40e_is_vsi_in_vlan(struct i40e_vsi *vsi);

struct i40e_mac_filter *i40e_find_mac(struct i40e_vsi *vsi, const u8 *macaddr);

#ifdef I40E_FCOE

int __i40e_setup_tc(struct net_device *netdev, u32 handle, __be16 proto,

		    struct tc_to_netdev *tc);

void i40e_netpoll(struct net_device *netdev);

int i40e_fcoe_enable(struct net_device *netdev);

int i40e_fcoe_disable(struct net_device *netdev);

int i40e_fcoe_vsi_init(struct i40e_vsi *vsi, struct i40e_vsi_context *ctxt);

u8 i40e_get_fcoe_tc_map(struct i40e_pf *pf);

void i40e_fcoe_config_netdev(struct net_device *netdev, struct i40e_vsi *vsi);

void i40e_fcoe_vsi_setup(struct i40e_pf *pf);

void i40e_init_pf_fcoe(struct i40e_pf *pf);

int i40e_fcoe_setup_ddp_resources(struct i40e_vsi *vsi);

void i40e_fcoe_free_ddp_resources(struct i40e_vsi *vsi);

int i40e_fcoe_handle_offload(struct i40e_ring *rx_ring,

			     union i40e_rx_desc *rx_desc,

			     struct sk_buff *skb);

void i40e_fcoe_handle_status(struct i40e_ring *rx_ring,

			     union i40e_rx_desc *rx_desc, u8 prog_id);

#endif /* I40E_FCOE */

void i40e_vlan_stripping_enable(struct i40e_vsi *vsi);

#ifdef CONFIG_I40E_DCB

void i40e_dcbnl_flush_apps(struct i40e_pf *pf,

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

+2 −0
Original line number Diff line number Diff line
@@ -147,6 +147,8 @@ void i40e_notify_client_of_l2_param_changes(struct i40e_vsi *vsi) 
		dev_dbg(&vsi->back->pdev->dev, "Client is not open, abort l2 param change\n");

		return;

	}

	memset(&params, 0, sizeof(params));

	i40e_client_get_params(vsi, &params);

	memcpy(&cdev->lan_info.params, &params, sizeof(struct i40e_params));

	cdev->client->ops->l2_param_change(&cdev->lan_info, cdev->client,

					   &params);

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

+0 −27
Original line number Diff line number Diff line
@@ -1088,33 +1088,6 @@ void i40e_pre_tx_queue_cfg(struct i40e_hw *hw, u32 queue, bool enable) 


	wr32(hw, I40E_GLLAN_TXPRE_QDIS(reg_block), reg_val);

}

#ifdef I40E_FCOE



/**

 * i40e_get_san_mac_addr - get SAN MAC address

 * @hw: pointer to the HW structure

 * @mac_addr: pointer to SAN MAC address

 *

 * Reads the adapter's SAN MAC address from NVM

 **/

i40e_status i40e_get_san_mac_addr(struct i40e_hw *hw, u8 *mac_addr)

{

	struct i40e_aqc_mac_address_read_data addrs;

	i40e_status status;

	u16 flags = 0;



	status = i40e_aq_mac_address_read(hw, &flags, &addrs, NULL);

	if (status)

		return status;



	if (flags & I40E_AQC_SAN_ADDR_VALID)

		ether_addr_copy(mac_addr, addrs.pf_san_mac);

	else

		status = I40E_ERR_INVALID_MAC_ADDR;



	return status;

}

#endif



/**

 *  i40e_read_pba_string - Reads part number string from EEPROM