Commit 37dc8fea authored by Jesse Brandeburg's avatar Jesse Brandeburg Committed by Tony Nguyen
Browse files

iavf: clean up packet type lookup table 



Remove the unused ptype struct value, which makes table init easier for
the zero entries, and use ranged initializer to remove a bunch of code
(works with gcc and clang). There is no significant functional change.

Signed-off-by: default avatarJesse Brandeburg <jesse.brandeburg@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent c6e088bf

drivers/net/ethernet/intel/iavf/iavf_common.c

+6 −118
Original line number Diff line number Diff line
@@ -522,9 +522,9 @@ enum iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 vsi_id, 
 * ENDIF

 */



/* macro to make the table lines short */

/* macro to make the table lines short, use explicit indexing with [PTYPE] */

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

	{	PTYPE, \

	[PTYPE] = { \

		1, \

		IAVF_RX_PTYPE_OUTER_##OUTER_IP, \

		IAVF_RX_PTYPE_OUTER_##OUTER_IP_VER, \
@@ -535,16 +535,15 @@ enum iavf_status iavf_aq_set_rss_key(struct iavf_hw *hw, u16 vsi_id, 
		IAVF_RX_PTYPE_INNER_PROT_##I, \

		IAVF_RX_PTYPE_PAYLOAD_LAYER_##PL }



#define IAVF_PTT_UNUSED_ENTRY(PTYPE) \

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

#define IAVF_PTT_UNUSED_ENTRY(PTYPE) [PTYPE] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }



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

#define IAVF_RX_PTYPE_NOF		IAVF_RX_PTYPE_NOT_FRAG

#define IAVF_RX_PTYPE_FRG		IAVF_RX_PTYPE_FRAG

#define IAVF_RX_PTYPE_INNER_PROT_TS	IAVF_RX_PTYPE_INNER_PROT_TIMESYNC



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

struct iavf_rx_ptype_decoded iavf_ptype_lookup[] = {

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

struct iavf_rx_ptype_decoded iavf_ptype_lookup[BIT(8)] = {

	/* L2 Packet types */

	IAVF_PTT_UNUSED_ENTRY(0),

	IAVF_PTT(1,  L2, NONE, NOF, NONE, NONE, NOF, NONE, PAY2),
@@ -750,118 +749,7 @@ struct iavf_rx_ptype_decoded iavf_ptype_lookup[] = { 
	IAVF_PTT(153, IP, IPV6, NOF, IP_GRENAT_MAC_VLAN, IPV6, NOF, ICMP, PAY4),



	/* unused entries */

	IAVF_PTT_UNUSED_ENTRY(154),

	IAVF_PTT_UNUSED_ENTRY(155),

	IAVF_PTT_UNUSED_ENTRY(156),

	IAVF_PTT_UNUSED_ENTRY(157),

	IAVF_PTT_UNUSED_ENTRY(158),

	IAVF_PTT_UNUSED_ENTRY(159),



	IAVF_PTT_UNUSED_ENTRY(160),

	IAVF_PTT_UNUSED_ENTRY(161),

	IAVF_PTT_UNUSED_ENTRY(162),

	IAVF_PTT_UNUSED_ENTRY(163),

	IAVF_PTT_UNUSED_ENTRY(164),

	IAVF_PTT_UNUSED_ENTRY(165),

	IAVF_PTT_UNUSED_ENTRY(166),

	IAVF_PTT_UNUSED_ENTRY(167),

	IAVF_PTT_UNUSED_ENTRY(168),

	IAVF_PTT_UNUSED_ENTRY(169),



	IAVF_PTT_UNUSED_ENTRY(170),

	IAVF_PTT_UNUSED_ENTRY(171),

	IAVF_PTT_UNUSED_ENTRY(172),

	IAVF_PTT_UNUSED_ENTRY(173),

	IAVF_PTT_UNUSED_ENTRY(174),

	IAVF_PTT_UNUSED_ENTRY(175),

	IAVF_PTT_UNUSED_ENTRY(176),

	IAVF_PTT_UNUSED_ENTRY(177),

	IAVF_PTT_UNUSED_ENTRY(178),

	IAVF_PTT_UNUSED_ENTRY(179),



	IAVF_PTT_UNUSED_ENTRY(180),

	IAVF_PTT_UNUSED_ENTRY(181),

	IAVF_PTT_UNUSED_ENTRY(182),

	IAVF_PTT_UNUSED_ENTRY(183),

	IAVF_PTT_UNUSED_ENTRY(184),

	IAVF_PTT_UNUSED_ENTRY(185),

	IAVF_PTT_UNUSED_ENTRY(186),

	IAVF_PTT_UNUSED_ENTRY(187),

	IAVF_PTT_UNUSED_ENTRY(188),

	IAVF_PTT_UNUSED_ENTRY(189),



	IAVF_PTT_UNUSED_ENTRY(190),

	IAVF_PTT_UNUSED_ENTRY(191),

	IAVF_PTT_UNUSED_ENTRY(192),

	IAVF_PTT_UNUSED_ENTRY(193),

	IAVF_PTT_UNUSED_ENTRY(194),

	IAVF_PTT_UNUSED_ENTRY(195),

	IAVF_PTT_UNUSED_ENTRY(196),

	IAVF_PTT_UNUSED_ENTRY(197),

	IAVF_PTT_UNUSED_ENTRY(198),

	IAVF_PTT_UNUSED_ENTRY(199),



	IAVF_PTT_UNUSED_ENTRY(200),

	IAVF_PTT_UNUSED_ENTRY(201),

	IAVF_PTT_UNUSED_ENTRY(202),

	IAVF_PTT_UNUSED_ENTRY(203),

	IAVF_PTT_UNUSED_ENTRY(204),

	IAVF_PTT_UNUSED_ENTRY(205),

	IAVF_PTT_UNUSED_ENTRY(206),

	IAVF_PTT_UNUSED_ENTRY(207),

	IAVF_PTT_UNUSED_ENTRY(208),

	IAVF_PTT_UNUSED_ENTRY(209),



	IAVF_PTT_UNUSED_ENTRY(210),

	IAVF_PTT_UNUSED_ENTRY(211),

	IAVF_PTT_UNUSED_ENTRY(212),

	IAVF_PTT_UNUSED_ENTRY(213),

	IAVF_PTT_UNUSED_ENTRY(214),

	IAVF_PTT_UNUSED_ENTRY(215),

	IAVF_PTT_UNUSED_ENTRY(216),

	IAVF_PTT_UNUSED_ENTRY(217),

	IAVF_PTT_UNUSED_ENTRY(218),

	IAVF_PTT_UNUSED_ENTRY(219),



	IAVF_PTT_UNUSED_ENTRY(220),

	IAVF_PTT_UNUSED_ENTRY(221),

	IAVF_PTT_UNUSED_ENTRY(222),

	IAVF_PTT_UNUSED_ENTRY(223),

	IAVF_PTT_UNUSED_ENTRY(224),

	IAVF_PTT_UNUSED_ENTRY(225),

	IAVF_PTT_UNUSED_ENTRY(226),

	IAVF_PTT_UNUSED_ENTRY(227),

	IAVF_PTT_UNUSED_ENTRY(228),

	IAVF_PTT_UNUSED_ENTRY(229),



	IAVF_PTT_UNUSED_ENTRY(230),

	IAVF_PTT_UNUSED_ENTRY(231),

	IAVF_PTT_UNUSED_ENTRY(232),

	IAVF_PTT_UNUSED_ENTRY(233),

	IAVF_PTT_UNUSED_ENTRY(234),

	IAVF_PTT_UNUSED_ENTRY(235),

	IAVF_PTT_UNUSED_ENTRY(236),

	IAVF_PTT_UNUSED_ENTRY(237),

	IAVF_PTT_UNUSED_ENTRY(238),

	IAVF_PTT_UNUSED_ENTRY(239),



	IAVF_PTT_UNUSED_ENTRY(240),

	IAVF_PTT_UNUSED_ENTRY(241),

	IAVF_PTT_UNUSED_ENTRY(242),

	IAVF_PTT_UNUSED_ENTRY(243),

	IAVF_PTT_UNUSED_ENTRY(244),

	IAVF_PTT_UNUSED_ENTRY(245),

	IAVF_PTT_UNUSED_ENTRY(246),

	IAVF_PTT_UNUSED_ENTRY(247),

	IAVF_PTT_UNUSED_ENTRY(248),

	IAVF_PTT_UNUSED_ENTRY(249),



	IAVF_PTT_UNUSED_ENTRY(250),

	IAVF_PTT_UNUSED_ENTRY(251),

	IAVF_PTT_UNUSED_ENTRY(252),

	IAVF_PTT_UNUSED_ENTRY(253),

	IAVF_PTT_UNUSED_ENTRY(254),

	IAVF_PTT_UNUSED_ENTRY(255)

	[154 ... 255] = { 0, 0, 0, 0, 0, 0, 0, 0, 0 }

};



/**

drivers/net/ethernet/intel/iavf/iavf_type.h

+0 −1
Original line number Diff line number Diff line
@@ -370,7 +370,6 @@ enum iavf_rx_l2_ptype { 
};



struct iavf_rx_ptype_decoded {

	u32 ptype:8;

	u32 known:1;

	u32 outer_ip:1;

	u32 outer_ip_ver:1;