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

Commit 072cec77 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-04-19

This series contains updates to i40e and i40evf only, most notable being
the addition of trace points for BPF programs.

Tobias Klauser updates i40evf to use net_device stats struct instead
of a local private copy.

Preethi updates the VF driver to not enable receive checksum offload by
default for tunneled packets.

Alex fixes an issue he introduced when he converted the code over to
using the length field to determine if a descriptor was done or not.

Mitch adds the ability to dump additional information on the VFs, which
is not available through 'ip link show' using debugfs.

Scott adds trace points to the drivers so that BPF programs can be
attached for feature testing and verification.

Jingjing adds admin queue functions for Pipeline Personalization Profile
commands.

Jake does most of the heavy lifting in this series, starting with the
a reduction in the scope of the RTNL lock being held while resetting VFs
to allow multiple PFs to reset in a timely manner.  Factored out the
direct queue modification so that we are able to re-use the code.
Reduced the wait time for admin queue commands to complete, since we were
waiting a minimum of a millisecond, when in practice the admin queue
command is processed often much faster.  Cleaned up code (flag) we never
use.  Make the code to resetting all the VFs optimized for parallel
computing instead of the current way is a serialized fashion, to help
reduce the time it takes.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 76bb5db5 3480756f

drivers/net/ethernet/intel/i40e/Makefile

+3 −0
Original line number Diff line number Diff line
@@ -28,6 +28,9 @@ 
# Makefile for the Intel(R) Ethernet Connection XL710 (i40e.ko) driver

#



ccflags-y += -I$(src)

subdir-ccflags-y += -I$(src)



obj-$(CONFIG_I40E) += i40e.o



i40e-objs := i40e_main.o \

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

+3 −16
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ enum i40e_state_t { 
	__I40E_DOWN_REQUESTED,

	__I40E_FD_FLUSH_REQUESTED,

	__I40E_RESET_FAILED,

	__I40E_PORT_TX_SUSPENDED,

	__I40E_PORT_SUSPENDED,

	__I40E_VF_DISABLE,

};
@@ -762,21 +762,6 @@ static inline void i40e_vsi_setup_irqhandler(struct i40e_vsi *vsi, 
	vsi->irq_handler = irq_handler;

}



/**

 * i40e_rx_is_programming_status - check for programming status descriptor

 * @qw: the first quad word of the program status descriptor

 *

 * The value of in the descriptor length field indicate if this

 * is a programming status descriptor for flow director or FCoE

 * by the value of I40E_RX_PROG_STATUS_DESC_LENGTH, otherwise

 * it is a packet descriptor.

 **/

static inline bool i40e_rx_is_programming_status(u64 qw)

{

	return I40E_RX_PROG_STATUS_DESC_LENGTH ==

		(qw >> I40E_RX_PROG_STATUS_DESC_LENGTH_SHIFT);

}



/**

 * i40e_get_fd_cnt_all - get the total FD filter space available

 * @pf: pointer to the PF struct
@@ -883,6 +868,8 @@ void i40e_notify_client_of_vf_msg(struct i40e_vsi *vsi, u32 vf_id, 


int i40e_vsi_start_rings(struct i40e_vsi *vsi);

void i40e_vsi_stop_rings(struct i40e_vsi *vsi);

void i40e_vsi_stop_rings_no_wait(struct  i40e_vsi *vsi);

int i40e_vsi_wait_queues_disabled(struct i40e_vsi *vsi);

int i40e_reconfig_rss_queues(struct i40e_pf *pf, int queue_count);

struct i40e_veb *i40e_veb_setup(struct i40e_pf *pf, u16 flags, u16 uplink_seid,

				u16 downlink_seid, u8 enabled_tc);

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

+2 −2
Original line number Diff line number Diff line
@@ -850,8 +850,8 @@ i40e_status i40e_asq_send_command(struct i40e_hw *hw, 
			 */

			if (i40e_asq_done(hw))

				break;

			usleep_range(1000, 2000);

			total_delay++;

			udelay(50);

			total_delay += 50;

		} while (total_delay < hw->aq.asq_cmd_timeout);

	}

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

+1 −1
Original line number Diff line number Diff line
@@ -151,7 +151,7 @@ static inline int i40e_aq_rc_to_posix(int aq_ret, int aq_rc) 


/* general information */

#define I40E_AQ_LARGE_BUF	512

#define I40E_ASQ_CMD_TIMEOUT	250  /* msecs */

#define I40E_ASQ_CMD_TIMEOUT	250000  /* usecs */



void i40e_fill_default_direct_cmd_desc(struct i40e_aq_desc *desc,

				       u16 opcode);

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

+34 −0
Original line number Diff line number Diff line
@@ -190,6 +190,10 @@ enum i40e_admin_queue_opc { 
	i40e_aqc_opc_add_mirror_rule	= 0x0260,

	i40e_aqc_opc_delete_mirror_rule	= 0x0261,



	/* Pipeline Personalization Profile */

	i40e_aqc_opc_write_personalization_profile	= 0x0270,

	i40e_aqc_opc_get_personalization_profile_list	= 0x0271,



	/* DCB commands */

	i40e_aqc_opc_dcb_ignore_pfc	= 0x0301,

	i40e_aqc_opc_dcb_updated	= 0x0302,
@@ -1431,6 +1435,36 @@ struct i40e_aqc_add_delete_mirror_rule_completion { 


I40E_CHECK_CMD_LENGTH(i40e_aqc_add_delete_mirror_rule_completion);



/* Pipeline Personalization Profile */

struct i40e_aqc_write_personalization_profile {

	u8      flags;

	u8      reserved[3];

	__le32  profile_track_id;

	__le32  addr_high;

	__le32  addr_low;

};



I40E_CHECK_CMD_LENGTH(i40e_aqc_write_personalization_profile);



struct i40e_aqc_write_ppp_resp {

	__le32 error_offset;

	__le32 error_info;

	__le32 addr_high;

	__le32 addr_low;

};



struct i40e_aqc_get_applied_profiles {

	u8      flags;

#define I40E_AQC_GET_PPP_GET_CONF	0x1

#define I40E_AQC_GET_PPP_GET_RDPU_CONF	0x2

	u8      rsv[3];

	__le32  reserved;

	__le32  addr_high;

	__le32  addr_low;

};



I40E_CHECK_CMD_LENGTH(i40e_aqc_get_applied_profiles);



/* DCB 0x03xx*/



/* PFC Ignore (direct 0x0301)