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

Commit b2d36c03 authored by Kevin Scott's avatar Kevin Scott Committed by Jeff Kirsher
Browse files

i40e/i40evf: Remove reserved PCTYPE defines 



Patch to remove PCTYPE definitions which are now reserved.

Change-ID: I66c1c16a45a16f4894b2983101ab2a48ce03f1f4
Signed-off-by: default avatarKevin Scott <kevin.c.scott@intel.com>
Signed-off-by: default avatarShannon Nelson <shannon.nelson@intel.com>
Tested-by: default avatarJim Young <jamesx.m.young@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent e7046ee1

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

+8 −16
Original line number Diff line number Diff line
@@ -1288,15 +1288,11 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) 
	case UDP_V4_FLOW:

		switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {

		case 0:

			hena &=

			~(((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) |

			((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) |

			hena &= ~(((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |

				  ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4));

			break;

		case (RXH_L4_B_0_1 | RXH_L4_B_2_3):

			hena |=

			(((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP)  |

			((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) |

			hena |= (((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) |

				  ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4));

			break;

		default:
@@ -1306,15 +1302,11 @@ static int i40e_set_rss_hash_opt(struct i40e_pf *pf, struct ethtool_rxnfc *nfc) 
	case UDP_V6_FLOW:

		switch (nfc->data & (RXH_L4_B_0_1 | RXH_L4_B_2_3)) {

		case 0:

			hena &=

			~(((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) |

			((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) |

			hena &= ~(((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |

				  ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6));

			break;

		case (RXH_L4_B_0_1 | RXH_L4_B_2_3):

			hena |=

			(((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP)  |

			((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) |

			hena |= (((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) |

				 ((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV6));

			break;

		default:

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

+12 −17
Original line number Diff line number Diff line
@@ -184,7 +184,6 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi, 
	struct iphdr *ip;

	bool err = false;

	int ret;

	int i;

	static char packet[] = {0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0x08, 0,

		0x45, 0, 0, 0x1c, 0, 0, 0x40, 0, 0x40, 0x11, 0, 0, 0, 0, 0, 0,

		0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0, 0};
@@ -200,11 +199,8 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi, 
	ip->saddr = fd_data->src_ip[0];

	udp->source = fd_data->src_port;



	for (i = I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP;

	     i <= I40E_FILTER_PCTYPE_NONF_IPV4_UDP; i++) {

		fd_data->pctype = i;

	fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_UDP;

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



	if (ret) {

		dev_info(&pf->pdev->dev,

			 "Filter command send failed for PCTYPE %d (ret = %d)\n",
@@ -215,7 +211,6 @@ static int i40e_add_del_fdir_udpv4(struct i40e_vsi *vsi, 
			 "Filter OK for PCTYPE %d (ret = %d)\n",

			 fd_data->pctype, ret);

	}

	}



	return err ? -EOPNOTSUPP : 0;

}
@@ -263,7 +258,7 @@ static int i40e_add_del_fdir_tcpv4(struct i40e_vsi *vsi, 
		}

	}



	fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN;

	fd_data->pctype = I40E_FILTER_PCTYPE_NONF_IPV4_TCP;

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



	if (ret) {

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

+0 −5
Original line number Diff line number Diff line
@@ -69,16 +69,11 @@ enum i40e_dyn_idx_t { 


/* Supported RSS offloads */

#define I40E_DEFAULT_RSS_HENA ( \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_SCTP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_OTHER) | \

	((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP) | \

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

+3 −7
Original line number Diff line number Diff line
@@ -866,18 +866,14 @@ struct i40e_filter_program_desc { 


/* Packet Classifier Types for filters */

enum i40e_filter_pctype {

	/* Note: Values 0-28 are reserved for future use */

	I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP	= 29,

	I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP	= 30,

	/* Note: Values 0-30 are reserved for future use */

	I40E_FILTER_PCTYPE_NONF_IPV4_UDP		= 31,

	I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN		= 32,

	/* Note: Value 32 is reserved for future use */

	I40E_FILTER_PCTYPE_NONF_IPV4_TCP		= 33,

	I40E_FILTER_PCTYPE_NONF_IPV4_SCTP		= 34,

	I40E_FILTER_PCTYPE_NONF_IPV4_OTHER		= 35,

	I40E_FILTER_PCTYPE_FRAG_IPV4			= 36,

	/* Note: Values 37-38 are reserved for future use */

	I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP	= 39,

	I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP	= 40,

	/* Note: Values 37-40 are reserved for future use */

	I40E_FILTER_PCTYPE_NONF_IPV6_UDP		= 41,

	I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN		= 42,

	I40E_FILTER_PCTYPE_NONF_IPV6_TCP		= 43,

drivers/net/ethernet/intel/i40evf/i40e_txrx.h

+0 −5
Original line number Diff line number Diff line
@@ -69,16 +69,11 @@ enum i40e_dyn_idx_t { 


/* Supported RSS offloads */

#define I40E_DEFAULT_RSS_HENA ( \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV4_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV4_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_SCTP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP_SYN) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_TCP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV4_OTHER) | \

	((u64)1 << I40E_FILTER_PCTYPE_FRAG_IPV4) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_UNICAST_IPV6_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_MULTICAST_IPV6_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_UDP) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP_SYN) | \

	((u64)1 << I40E_FILTER_PCTYPE_NONF_IPV6_TCP) | \