Skip to content

Commit

Permalink
iavf: change the flex-byte support number to macro definition
Browse files Browse the repository at this point in the history
The maximum number (2) of flex-byte support is derived from ethtool
use-def data size (8 byte).

Change the magic number 2 to macro definition, and add the comment to
track the design thinking, so the code is clear and easily maintained.

Signed-off-by: Haiyue Wang <haiyue.wang@intel.com>
Signed-off-by: Tony Nguyen <anthony.l.nguyen@intel.com>
  • Loading branch information
Haiyue Wang authored and Tony Nguyen committed Apr 23, 2021
1 parent 1a0e880 commit f995f95
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 3 deletions.
2 changes: 1 addition & 1 deletion drivers/net/ethernet/intel/iavf/iavf_ethtool.c
Original file line number Diff line number Diff line change
Expand Up @@ -939,7 +939,7 @@ iavf_parse_rx_flow_user_data(struct ethtool_rx_flow_spec *fsp,
if (!(fsp->flow_type & FLOW_EXT))
return 0;

for (i = 0; i < 2; i++) {
for (i = 0; i < IAVF_FLEX_WORD_NUM; i++) {
#define IAVF_USERDEF_FLEX_WORD_M GENMASK(15, 0)
#define IAVF_USERDEF_FLEX_OFFS_S 16
#define IAVF_USERDEF_FLEX_OFFS_M GENMASK(31, IAVF_USERDEF_FLEX_OFFS_S)
Expand Down
9 changes: 7 additions & 2 deletions drivers/net/ethernet/intel/iavf/iavf_fdir.h
Original file line number Diff line number Diff line change
Expand Up @@ -35,6 +35,11 @@ enum iavf_fdir_flow_type {
IAVF_FDIR_FLOW_PTYPE_MAX,
};

/* Must not exceed the array element number of '__be32 data[2]' in the ethtool
* 'struct ethtool_rx_flow_spec.m_ext.data[2]' to express the flex-byte (word).
*/
#define IAVF_FLEX_WORD_NUM 2

struct iavf_flex_word {
u16 offset;
u16 word;
Expand Down Expand Up @@ -71,7 +76,7 @@ struct iavf_fdir_ip {
};

struct iavf_fdir_extra {
u32 usr_def[2];
u32 usr_def[IAVF_FLEX_WORD_NUM];
};

/* bookkeeping of Flow Director filters */
Expand All @@ -95,7 +100,7 @@ struct iavf_fdir_fltr {
/* flex byte filter data */
u8 ip_ver; /* used to adjust the flex offset, 4 : IPv4, 6 : IPv6 */
u8 flex_cnt;
struct iavf_flex_word flex_words[2];
struct iavf_flex_word flex_words[IAVF_FLEX_WORD_NUM];

u32 flow_id;

Expand Down

0 comments on commit f995f95

Please sign in to comment.