Commit 91bd66e4 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/jkirsher/net-next 



Jeff Kirsher says:

====================
Intel Wired LAN Driver Updates

This series contains updates to i40e and i40evf.

Most notable are:
Joseph completes the implementation of the ethtool ntuple rule
management interface by adding the get, update and delete interface
reset.

Akeem provides a fix to prevent a possible overflow due to multiplication
of number and size by using kzalloc, so use kcalloc.

Jesse provides an implementation for skb_set_hash() and adds the L4 type
return when we know it is an L4 hash.  He also adds a counter to
statistics for Tx timeouts to help users.  Lastly he provides a change
to stay away from the cache line where the done bit may be getting
written back for the transmit ring since the hardware may be writing the
whole cache line for a partial update.

Shannon cleans up code comments.

Anjali removes a firmware workaround for newer firmware since the number
of MSIx vectors are being reported correctly.

v2:
 -  dropped patch 01 of the series based on feedback from the author
    Joe Perches and Shannon Nelson.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 38940042 2062862a

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

+25 −12
Original line number Diff line number Diff line
@@ -86,12 +86,12 @@ 


#define I40E_NVM_VERSION_LO_SHIFT  0

#define I40E_NVM_VERSION_LO_MASK   (0xff << I40E_NVM_VERSION_LO_SHIFT)

#define I40E_NVM_VERSION_HI_SHIFT  8

#define I40E_NVM_VERSION_HI_MASK   (0xff << I40E_NVM_VERSION_HI_SHIFT)

#define I40E_NVM_VERSION_HI_SHIFT  12

#define I40E_NVM_VERSION_HI_MASK   (0xf << I40E_NVM_VERSION_HI_SHIFT)



/* The values in here are decimal coded as hex as is the case in the NVM map*/

#define I40E_CURRENT_NVM_VERSION_HI 0x2

#define I40E_CURRENT_NVM_VERSION_LO 0x30

#define I40E_CURRENT_NVM_VERSION_LO 0x40



/* magic for getting defines into strings */

#define STRINGIFY(foo)  #foo
@@ -152,8 +152,18 @@ struct i40e_lump_tracking { 
};



#define I40E_DEFAULT_ATR_SAMPLE_RATE	20

#define I40E_FDIR_MAX_RAW_PACKET_LOOKUP 512

struct i40e_fdir_data {

#define I40E_FDIR_MAX_RAW_PACKET_SIZE   512

struct i40e_fdir_filter {

	struct hlist_node fdir_node;

	/* filter ipnut set */

	u8 flow_type;

	u8 ip4_proto;

	__be32 dst_ip[4];

	__be32 src_ip[4];

	__be16 src_port;

	__be16 dst_port;

	__be32 sctp_v_tag;

	/* filter control */

	u16 q_index;

	u8  flex_off;

	u8  pctype;
@@ -162,7 +172,6 @@ struct i40e_fdir_data { 
	u8  fd_status;

	u16 cnt_index;

	u32 fd_id;

	u8  *raw_packet;

};



#define I40E_ETH_P_LLDP			0x88cc
@@ -210,6 +219,9 @@ struct i40e_pf { 
	u8 atr_sample_rate;

	bool wol_en;



	struct hlist_head fdir_filter_list;

	u16 fdir_pf_active_filters;



#ifdef CONFIG_I40E_VXLAN

	__be16  vxlan_ports[I40E_MAX_PF_UDP_OFFLOAD_PORTS];

	u16 pending_vxlan_bitmap;
@@ -477,10 +489,10 @@ static inline char *i40e_fw_version_str(struct i40e_hw *hw) 
		 "f%d.%d a%d.%d n%02x.%02x e%08x",

		 hw->aq.fw_maj_ver, hw->aq.fw_min_ver,

		 hw->aq.api_maj_ver, hw->aq.api_min_ver,

		 (hw->nvm.version & I40E_NVM_VERSION_HI_MASK)

						>> I40E_NVM_VERSION_HI_SHIFT,

		 (hw->nvm.version & I40E_NVM_VERSION_LO_MASK)

						>> I40E_NVM_VERSION_LO_SHIFT,

		 (hw->nvm.version & I40E_NVM_VERSION_HI_MASK) >>

			I40E_NVM_VERSION_HI_SHIFT,

		 (hw->nvm.version & I40E_NVM_VERSION_LO_MASK) >>

			I40E_NVM_VERSION_LO_SHIFT,

		 hw->nvm.eetrack);



	return buf;
@@ -534,9 +546,10 @@ struct rtnl_link_stats64 *i40e_get_vsi_stats_struct(struct i40e_vsi *vsi); 
int i40e_fetch_switch_configuration(struct i40e_pf *pf,

				    bool printconfig);



int i40e_program_fdir_filter(struct i40e_fdir_data *fdir_data,

int i40e_program_fdir_filter(struct i40e_fdir_filter *fdir_data, u8 *raw_packet,

			     struct i40e_pf *pf, bool add);



int i40e_add_del_fdir(struct i40e_vsi *vsi,

		      struct i40e_fdir_filter *input, bool add);

void i40e_set_ethtool_ops(struct net_device *netdev);

struct i40e_mac_filter *i40e_add_filter(struct i40e_vsi *vsi,

					u8 *macaddr, s16 vlan,

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

+366 −0
Original line number Diff line number Diff line
@@ -162,6 +162,372 @@ i40e_status i40e_aq_queue_shutdown(struct i40e_hw *hw, 
	return status;

}



/* The i40e_ptype_lookup table is used to convert from the 8-bit ptype in the

 * hardware to a bit-field that can be used by SW to more easily determine the

 * packet type.

 *

 * Macros are used to shorten the table lines and make this table human

 * readable.

 *

 * We store the PTYPE in the top byte of the bit field - this is just so that

 * we can check that the table doesn't have a row missing, as the index into

 * the table should be the PTYPE.

 *

 * Typical work flow:

 *

 * IF NOT i40e_ptype_lookup[ptype].known

 * THEN

 *      Packet is unknown

 * ELSE IF i40e_ptype_lookup[ptype].outer_ip == I40E_RX_PTYPE_OUTER_IP

 *      Use the rest of the fields to look at the tunnels, inner protocols, etc

 * ELSE

 *      Use the enum i40e_rx_l2_ptype to decode the packet type

 * ENDIF

 */



/* macro to make the table lines short */

#define I40E_PTT(PTYPE, OUTER_IP, OUTER_IP_VER, OUTER_FRAG, T, TE, TEF, I, PL)\

	{	PTYPE, \

		1, \

		I40E_RX_PTYPE_OUTER_##OUTER_IP, \

		I40E_RX_PTYPE_OUTER_##OUTER_IP_VER, \

		I40E_RX_PTYPE_##OUTER_FRAG, \

		I40E_RX_PTYPE_TUNNEL_##T, \

		I40E_RX_PTYPE_TUNNEL_END_##TE, \

		I40E_RX_PTYPE_##TEF, \

		I40E_RX_PTYPE_INNER_PROT_##I, \

		I40E_RX_PTYPE_PAYLOAD_LAYER_##PL }



#define I40E_PTT_UNUSED_ENTRY(PTYPE) \

		{ PTYPE, 0, 0, 0, 0, 0, 0, 0, 0, 0 }



/* shorter macros makes the table fit but are terse */

#define I40E_RX_PTYPE_NOF		I40E_RX_PTYPE_NOT_FRAG

#define I40E_RX_PTYPE_FRG		I40E_RX_PTYPE_FRAG

#define I40E_RX_PTYPE_INNER_PROT_TS	I40E_RX_PTYPE_INNER_PROT_TIMESYNC



/* Lookup table mapping the HW PTYPE to the bit field for decoding */

struct i40e_rx_ptype_decoded i40e_ptype_lookup[] = {

	/* L2 Packet types */

	I40E_PTT_UNUSED_ENTRY(0),

	I40E_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(2,  L2, NONE, NOF, NONE, NONE, NOF, TS,   PAY2),

	I40E_PTT(3,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT_UNUSED_ENTRY(4),

	I40E_PTT_UNUSED_ENTRY(5),

	I40E_PTT(6,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(7,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT_UNUSED_ENTRY(8),

	I40E_PTT_UNUSED_ENTRY(9),

	I40E_PTT(10, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),

	I40E_PTT(11, L2, NONE, NOF, NONE, NONE, NOF, NONE, NONE),

	I40E_PTT(12, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(13, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(14, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(15, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(16, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(17, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(18, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(19, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(20, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(21, L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY3),



	/* Non Tunneled IPv4 */

	I40E_PTT(22, IP, IPV4, FRG, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(23, IP, IPV4, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(24, IP, IPV4, NOF, NONE, NONE, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(25),

	I40E_PTT(26, IP, IPV4, NOF, NONE, NONE, NOF, TCP,  PAY4),

	I40E_PTT(27, IP, IPV4, NOF, NONE, NONE, NOF, SCTP, PAY4),

	I40E_PTT(28, IP, IPV4, NOF, NONE, NONE, NOF, ICMP, PAY4),



	/* IPv4 --> IPv4 */

	I40E_PTT(29, IP, IPV4, NOF, IP_IP, IPV4, FRG, NONE, PAY3),

	I40E_PTT(30, IP, IPV4, NOF, IP_IP, IPV4, NOF, NONE, PAY3),

	I40E_PTT(31, IP, IPV4, NOF, IP_IP, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(32),

	I40E_PTT(33, IP, IPV4, NOF, IP_IP, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(34, IP, IPV4, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(35, IP, IPV4, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),



	/* IPv4 --> IPv6 */

	I40E_PTT(36, IP, IPV4, NOF, IP_IP, IPV6, FRG, NONE, PAY3),

	I40E_PTT(37, IP, IPV4, NOF, IP_IP, IPV6, NOF, NONE, PAY3),

	I40E_PTT(38, IP, IPV4, NOF, IP_IP, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(39),

	I40E_PTT(40, IP, IPV4, NOF, IP_IP, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(41, IP, IPV4, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(42, IP, IPV4, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT */

	I40E_PTT(43, IP, IPV4, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),



	/* IPv4 --> GRE/NAT --> IPv4 */

	I40E_PTT(44, IP, IPV4, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),

	I40E_PTT(45, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),

	I40E_PTT(46, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(47),

	I40E_PTT(48, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(49, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(50, IP, IPV4, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT --> IPv6 */

	I40E_PTT(51, IP, IPV4, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),

	I40E_PTT(52, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),

	I40E_PTT(53, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(54),

	I40E_PTT(55, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(56, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(57, IP, IPV4, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT --> MAC */

	I40E_PTT(58, IP, IPV4, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),



	/* IPv4 --> GRE/NAT --> MAC --> IPv4 */

	I40E_PTT(59, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),

	I40E_PTT(60, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),

	I40E_PTT(61, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(62),

	I40E_PTT(63, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(64, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(65, IP, IPV4, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT -> MAC --> IPv6 */

	I40E_PTT(66, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),

	I40E_PTT(67, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),

	I40E_PTT(68, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(69),

	I40E_PTT(70, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(71, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(72, IP, IPV4, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),



	/* IPv4 --> GRE/NAT --> MAC/VLAN */

	I40E_PTT(73, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),



	/* IPv4 ---> GRE/NAT -> MAC/VLAN --> IPv4 */

	I40E_PTT(74, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),

	I40E_PTT(75, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),

	I40E_PTT(76, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(77),

	I40E_PTT(78, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(79, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(80, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),



	/* IPv4 -> GRE/NAT -> MAC/VLAN --> IPv6 */

	I40E_PTT(81, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),

	I40E_PTT(82, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),

	I40E_PTT(83, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(84),

	I40E_PTT(85, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(86, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(87, IP, IPV4, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),



	/* Non Tunneled IPv6 */

	I40E_PTT(88, IP, IPV6, FRG, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(89, IP, IPV6, NOF, NONE, NONE, NOF, NONE, PAY3),

	I40E_PTT(90, IP, IPV6, NOF, NONE, NONE, NOF, UDP,  PAY3),

	I40E_PTT_UNUSED_ENTRY(91),

	I40E_PTT(92, IP, IPV6, NOF, NONE, NONE, NOF, TCP,  PAY4),

	I40E_PTT(93, IP, IPV6, NOF, NONE, NONE, NOF, SCTP, PAY4),

	I40E_PTT(94, IP, IPV6, NOF, NONE, NONE, NOF, ICMP, PAY4),



	/* IPv6 --> IPv4 */

	I40E_PTT(95,  IP, IPV6, NOF, IP_IP, IPV4, FRG, NONE, PAY3),

	I40E_PTT(96,  IP, IPV6, NOF, IP_IP, IPV4, NOF, NONE, PAY3),

	I40E_PTT(97,  IP, IPV6, NOF, IP_IP, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(98),

	I40E_PTT(99,  IP, IPV6, NOF, IP_IP, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(100, IP, IPV6, NOF, IP_IP, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(101, IP, IPV6, NOF, IP_IP, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> IPv6 */

	I40E_PTT(102, IP, IPV6, NOF, IP_IP, IPV6, FRG, NONE, PAY3),

	I40E_PTT(103, IP, IPV6, NOF, IP_IP, IPV6, NOF, NONE, PAY3),

	I40E_PTT(104, IP, IPV6, NOF, IP_IP, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(105),

	I40E_PTT(106, IP, IPV6, NOF, IP_IP, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(107, IP, IPV6, NOF, IP_IP, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(108, IP, IPV6, NOF, IP_IP, IPV6, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT */

	I40E_PTT(109, IP, IPV6, NOF, IP_GRENAT, NONE, NOF, NONE, PAY3),



	/* IPv6 --> GRE/NAT -> IPv4 */

	I40E_PTT(110, IP, IPV6, NOF, IP_GRENAT, IPV4, FRG, NONE, PAY3),

	I40E_PTT(111, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, NONE, PAY3),

	I40E_PTT(112, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(113),

	I40E_PTT(114, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(115, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(116, IP, IPV6, NOF, IP_GRENAT, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> IPv6 */

	I40E_PTT(117, IP, IPV6, NOF, IP_GRENAT, IPV6, FRG, NONE, PAY3),

	I40E_PTT(118, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, NONE, PAY3),

	I40E_PTT(119, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(120),

	I40E_PTT(121, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(122, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(123, IP, IPV6, NOF, IP_GRENAT, IPV6, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC */

	I40E_PTT(124, IP, IPV6, NOF, IP_GRENAT_MAC, NONE, NOF, NONE, PAY3),



	/* IPv6 --> GRE/NAT -> MAC -> IPv4 */

	I40E_PTT(125, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, FRG, NONE, PAY3),

	I40E_PTT(126, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, NONE, PAY3),

	I40E_PTT(127, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(128),

	I40E_PTT(129, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(130, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(131, IP, IPV6, NOF, IP_GRENAT_MAC, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC -> IPv6 */

	I40E_PTT(132, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, FRG, NONE, PAY3),

	I40E_PTT(133, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, NONE, PAY3),

	I40E_PTT(134, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(135),

	I40E_PTT(136, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(137, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(138, IP, IPV6, NOF, IP_GRENAT_MAC, IPV6, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC/VLAN */

	I40E_PTT(139, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, NONE, NOF, NONE, PAY3),



	/* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv4 */

	I40E_PTT(140, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, FRG, NONE, PAY3),

	I40E_PTT(141, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, NONE, PAY3),

	I40E_PTT(142, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(143),

	I40E_PTT(144, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, TCP,  PAY4),

	I40E_PTT(145, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, SCTP, PAY4),

	I40E_PTT(146, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV4, NOF, ICMP, PAY4),



	/* IPv6 --> GRE/NAT -> MAC/VLAN --> IPv6 */

	I40E_PTT(147, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, FRG, NONE, PAY3),

	I40E_PTT(148, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, NONE, PAY3),

	I40E_PTT(149, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, UDP,  PAY4),

	I40E_PTT_UNUSED_ENTRY(150),

	I40E_PTT(151, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, TCP,  PAY4),

	I40E_PTT(152, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, SCTP, PAY4),

	I40E_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),



	/* unused entries */

	I40E_PTT_UNUSED_ENTRY(154),

	I40E_PTT_UNUSED_ENTRY(155),

	I40E_PTT_UNUSED_ENTRY(156),

	I40E_PTT_UNUSED_ENTRY(157),

	I40E_PTT_UNUSED_ENTRY(158),

	I40E_PTT_UNUSED_ENTRY(159),



	I40E_PTT_UNUSED_ENTRY(160),

	I40E_PTT_UNUSED_ENTRY(161),

	I40E_PTT_UNUSED_ENTRY(162),

	I40E_PTT_UNUSED_ENTRY(163),

	I40E_PTT_UNUSED_ENTRY(164),

	I40E_PTT_UNUSED_ENTRY(165),

	I40E_PTT_UNUSED_ENTRY(166),

	I40E_PTT_UNUSED_ENTRY(167),

	I40E_PTT_UNUSED_ENTRY(168),

	I40E_PTT_UNUSED_ENTRY(169),



	I40E_PTT_UNUSED_ENTRY(170),

	I40E_PTT_UNUSED_ENTRY(171),

	I40E_PTT_UNUSED_ENTRY(172),

	I40E_PTT_UNUSED_ENTRY(173),

	I40E_PTT_UNUSED_ENTRY(174),

	I40E_PTT_UNUSED_ENTRY(175),

	I40E_PTT_UNUSED_ENTRY(176),

	I40E_PTT_UNUSED_ENTRY(177),

	I40E_PTT_UNUSED_ENTRY(178),

	I40E_PTT_UNUSED_ENTRY(179),



	I40E_PTT_UNUSED_ENTRY(180),

	I40E_PTT_UNUSED_ENTRY(181),

	I40E_PTT_UNUSED_ENTRY(182),

	I40E_PTT_UNUSED_ENTRY(183),

	I40E_PTT_UNUSED_ENTRY(184),

	I40E_PTT_UNUSED_ENTRY(185),

	I40E_PTT_UNUSED_ENTRY(186),

	I40E_PTT_UNUSED_ENTRY(187),

	I40E_PTT_UNUSED_ENTRY(188),

	I40E_PTT_UNUSED_ENTRY(189),



	I40E_PTT_UNUSED_ENTRY(190),

	I40E_PTT_UNUSED_ENTRY(191),

	I40E_PTT_UNUSED_ENTRY(192),

	I40E_PTT_UNUSED_ENTRY(193),

	I40E_PTT_UNUSED_ENTRY(194),

	I40E_PTT_UNUSED_ENTRY(195),

	I40E_PTT_UNUSED_ENTRY(196),

	I40E_PTT_UNUSED_ENTRY(197),

	I40E_PTT_UNUSED_ENTRY(198),

	I40E_PTT_UNUSED_ENTRY(199),



	I40E_PTT_UNUSED_ENTRY(200),

	I40E_PTT_UNUSED_ENTRY(201),

	I40E_PTT_UNUSED_ENTRY(202),

	I40E_PTT_UNUSED_ENTRY(203),

	I40E_PTT_UNUSED_ENTRY(204),

	I40E_PTT_UNUSED_ENTRY(205),

	I40E_PTT_UNUSED_ENTRY(206),

	I40E_PTT_UNUSED_ENTRY(207),

	I40E_PTT_UNUSED_ENTRY(208),

	I40E_PTT_UNUSED_ENTRY(209),



	I40E_PTT_UNUSED_ENTRY(210),

	I40E_PTT_UNUSED_ENTRY(211),

	I40E_PTT_UNUSED_ENTRY(212),

	I40E_PTT_UNUSED_ENTRY(213),

	I40E_PTT_UNUSED_ENTRY(214),

	I40E_PTT_UNUSED_ENTRY(215),

	I40E_PTT_UNUSED_ENTRY(216),

	I40E_PTT_UNUSED_ENTRY(217),

	I40E_PTT_UNUSED_ENTRY(218),

	I40E_PTT_UNUSED_ENTRY(219),



	I40E_PTT_UNUSED_ENTRY(220),

	I40E_PTT_UNUSED_ENTRY(221),

	I40E_PTT_UNUSED_ENTRY(222),

	I40E_PTT_UNUSED_ENTRY(223),

	I40E_PTT_UNUSED_ENTRY(224),

	I40E_PTT_UNUSED_ENTRY(225),

	I40E_PTT_UNUSED_ENTRY(226),

	I40E_PTT_UNUSED_ENTRY(227),

	I40E_PTT_UNUSED_ENTRY(228),

	I40E_PTT_UNUSED_ENTRY(229),



	I40E_PTT_UNUSED_ENTRY(230),

	I40E_PTT_UNUSED_ENTRY(231),

	I40E_PTT_UNUSED_ENTRY(232),

	I40E_PTT_UNUSED_ENTRY(233),

	I40E_PTT_UNUSED_ENTRY(234),

	I40E_PTT_UNUSED_ENTRY(235),

	I40E_PTT_UNUSED_ENTRY(236),

	I40E_PTT_UNUSED_ENTRY(237),

	I40E_PTT_UNUSED_ENTRY(238),

	I40E_PTT_UNUSED_ENTRY(239),



	I40E_PTT_UNUSED_ENTRY(240),

	I40E_PTT_UNUSED_ENTRY(241),

	I40E_PTT_UNUSED_ENTRY(242),

	I40E_PTT_UNUSED_ENTRY(243),

	I40E_PTT_UNUSED_ENTRY(244),

	I40E_PTT_UNUSED_ENTRY(245),

	I40E_PTT_UNUSED_ENTRY(246),

	I40E_PTT_UNUSED_ENTRY(247),

	I40E_PTT_UNUSED_ENTRY(248),

	I40E_PTT_UNUSED_ENTRY(249),



	I40E_PTT_UNUSED_ENTRY(250),

	I40E_PTT_UNUSED_ENTRY(251),

	I40E_PTT_UNUSED_ENTRY(252),

	I40E_PTT_UNUSED_ENTRY(253),

	I40E_PTT_UNUSED_ENTRY(254),

	I40E_PTT_UNUSED_ENTRY(255)

};





/**

 * i40e_init_shared_code - Initialize the shared code

 * @hw: pointer to hardware structure

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

+6 −3
Original line number Diff line number Diff line
@@ -332,6 +332,7 @@ i40e_status i40e_lldp_to_dcb_config(u8 *lldpmib, 
	u16 type;

	u16 length;

	u16 typelength;

	u16 offset = 0;



	if (!lldpmib || !dcbcfg)

		return I40E_ERR_PARAM;
@@ -339,15 +340,17 @@ i40e_status i40e_lldp_to_dcb_config(u8 *lldpmib, 
	/* set to the start of LLDPDU */

	lldpmib += ETH_HLEN;

	tlv = (struct i40e_lldp_org_tlv *)lldpmib;

	while (tlv) {

	while (1) {

		typelength = ntohs(tlv->typelength);

		type = (u16)((typelength & I40E_LLDP_TLV_TYPE_MASK) >>

			     I40E_LLDP_TLV_TYPE_SHIFT);

		length = (u16)((typelength & I40E_LLDP_TLV_LEN_MASK) >>

			       I40E_LLDP_TLV_LEN_SHIFT);

		offset += sizeof(typelength) + length;



		if (type == I40E_TLV_TYPE_END)

			break;/* END TLV break out */

		/* END TLV or beyond LLDPDU size */

		if ((type == I40E_TLV_TYPE_END) || (offset > I40E_LLDPDU_SIZE))

			break;



		switch (type) {

		case I40E_TLV_TYPE_ORG:

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

+14 −13
Original line number Diff line number Diff line
@@ -1663,21 +1663,22 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
		desc = NULL;

	} else if ((strncmp(cmd_buf, "add fd_filter", 13) == 0) ||

		   (strncmp(cmd_buf, "rem fd_filter", 13) == 0)) {

		struct i40e_fdir_data fd_data;

		struct i40e_fdir_filter fd_data;

		u16 packet_len, i, j = 0;

		char *asc_packet;

		u8 *raw_packet;

		bool add = false;

		int ret;



		asc_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_LOOKUP,

		asc_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_SIZE,

				     GFP_KERNEL);

		if (!asc_packet)

			goto command_write_done;



		fd_data.raw_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_LOOKUP,

		raw_packet = kzalloc(I40E_FDIR_MAX_RAW_PACKET_SIZE,

				     GFP_KERNEL);



		if (!fd_data.raw_packet) {

		if (!raw_packet) {

			kfree(asc_packet);

			asc_packet = NULL;

			goto command_write_done;
@@ -1698,36 +1699,36 @@ static ssize_t i40e_dbg_command_write(struct file *filp, 
				 cnt);

			kfree(asc_packet);

			asc_packet = NULL;

			kfree(fd_data.raw_packet);

			kfree(raw_packet);

			goto command_write_done;

		}



		/* fix packet length if user entered 0 */

		if (packet_len == 0)

			packet_len = I40E_FDIR_MAX_RAW_PACKET_LOOKUP;

			packet_len = I40E_FDIR_MAX_RAW_PACKET_SIZE;



		/* make sure to check the max as well */

		packet_len = min_t(u16,

				   packet_len, I40E_FDIR_MAX_RAW_PACKET_LOOKUP);

				   packet_len, I40E_FDIR_MAX_RAW_PACKET_SIZE);



		for (i = 0; i < packet_len; i++) {

			sscanf(&asc_packet[j], "%2hhx ",

			       &fd_data.raw_packet[i]);

			       &raw_packet[i]);

			j += 3;

		}

		dev_info(&pf->pdev->dev, "FD raw packet dump\n");

		print_hex_dump(KERN_INFO, "FD raw packet: ",

			       DUMP_PREFIX_OFFSET, 16, 1,

			       fd_data.raw_packet, packet_len, true);

		ret = i40e_program_fdir_filter(&fd_data, pf, add);

			       raw_packet, packet_len, true);

		ret = i40e_program_fdir_filter(&fd_data, raw_packet, pf, add);

		if (!ret) {

			dev_info(&pf->pdev->dev, "Filter command send Status : Success\n");

		} else {

			dev_info(&pf->pdev->dev,

				 "Filter command send failed %d\n", ret);

		}

		kfree(fd_data.raw_packet);

		fd_data.raw_packet = NULL;

		kfree(raw_packet);

		raw_packet = NULL;

		kfree(asc_packet);

		asc_packet = NULL;

	} else if (strncmp(cmd_buf, "fd-atr off", 10) == 0) {

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

+190 −239

File changed.

Preview size limit exceeded, changes collapsed.

CRA Git | Maintained and supported by SUSTech CRA and CCSE