ice base update batch 2
Subsystems (2)
cover ice base update batch 2
Summary:
1. Add GTPU inner support for FDIR.
2. refine the VSI AQ command.
3. Add PTYPE metadata learning.
4. couple bug fix and code clean
5. update the Copyright date
Qi Zhang (9):
net/ice/base: align add VSI and update VSI AQ command buffer net/ice/base: remove the deprecated field net/ice/base: add package PTYPE enable information net/ice/base: fix for memory handling net/ice/base: limit forced overrides based on FW version net/ice/base: support GTPU inner for AVF FDIR net/ice/base: cleanup style issues
net/ice/base: updated the add scheduler node counter net/ice/base: update Copyright date
drivers/net/ice/base/README | 4 +- drivers/net/ice/base/ice_acl.c | 2 +- drivers/net/ice/base/ice_acl.h | 2 +- drivers/net/ice/base/ice_acl_ctrl.c | 2 +- drivers/net/ice/base/ice_adminq_cmd.h | 211 +++++++------- drivers/net/ice/base/ice_alloc.h | 2 +- drivers/net/ice/base/ice_bitops.h | 2 +- drivers/net/ice/base/ice_common.c | 16 +- drivers/net/ice/base/ice_common.h | 2 +- drivers/net/ice/base/ice_controlq.c | 2 +- drivers/net/ice/base/ice_controlq.h | 6 +- drivers/net/ice/base/ice_dcb.c | 2 +- drivers/net/ice/base/ice_dcb.h | 2 +- drivers/net/ice/base/ice_devids.h | 2 +- drivers/net/ice/base/ice_fdir.c | 357 +++++++++++++++++++++-- drivers/net/ice/base/ice_fdir.h | 2 +- drivers/net/ice/base/ice_flex_pipe.c | 81 ++++- drivers/net/ice/base/ice_flex_pipe.h | 5 +- drivers/net/ice/base/ice_flex_type.h | 25 +- drivers/net/ice/base/ice_flow.c | 8 +- drivers/net/ice/base/ice_flow.h | 2 +- drivers/net/ice/base/ice_hw_autogen.h | 2 +- drivers/net/ice/base/ice_lan_tx_rx.h | 2 +- drivers/net/ice/base/ice_nvm.c | 2 +- drivers/net/ice/base/ice_nvm.h | 2 +- drivers/net/ice/base/ice_osdep.h | 2 +- drivers/net/ice/base/ice_protocol_type.h | 2 +- drivers/net/ice/base/ice_sbq_cmd.h | 2 +- drivers/net/ice/base/ice_sched.c | 18 +- drivers/net/ice/base/ice_sched.h | 2 +- drivers/net/ice/base/ice_status.h | 2 +- drivers/net/ice/base/ice_switch.c | 2 +- drivers/net/ice/base/ice_switch.h | 3 +- drivers/net/ice/base/ice_type.h | 21 +- drivers/net/ice/base/ice_vlan_mode.c | 2 +- drivers/net/ice/base/ice_vlan_mode.h | 2 +- drivers/net/ice/base/meson.build | 2 +- drivers/net/ice/ice_ethdev.c | 88 +++--- 38 files changed, 655 insertions(+), 238 deletions(-)
Signature · 1 line
2.26.2
PATCH 1/9 net/ice/base: align add VSI and update VSI AQ command buffer
Aligned the buffer the following admin commands to their new definitions:
* 0x210 = add_vsi
* 0x211 = update_vsi
--- drivers/net/ice/base/ice_adminq_cmd.h | 209 +++++++++++++------------- drivers/net/ice/ice_ethdev.c | 88 +++++------ 2 files changed, 152 insertions(+), 145 deletions(-)
drivers/net/ice/base/ice_adminq_cmd.h +108 -101
@@ -432,144 +432,151 @@ struct ice_aqc_vsi_props {#define ICE_AQ_VSI_SW_FLAG_SRC_PRUNE BIT(7)u8 sw_flags2;#define ICE_AQ_VSI_SW_FLAG_RX_PRUNE_EN_S 0 -#define ICE_AQ_VSI_SW_FLAG_RX_PRUNE_EN_M \ - (0xF << ICE_AQ_VSI_SW_FLAG_RX_PRUNE_EN_S) +#define ICE_AQ_VSI_SW_FLAG_RX_PRUNE_EN_M (0xF << ICE_AQ_VSI_SW_FLAG_RX_PRUNE_EN_S)#define ICE_AQ_VSI_SW_FLAG_RX_VLAN_PRUNE_ENA BIT(0)#define ICE_AQ_VSI_SW_FLAG_LAN_ENA BIT(4)u8 veb_stat_id;#define ICE_AQ_VSI_SW_VEB_STAT_ID_S 0 -#define ICE_AQ_VSI_SW_VEB_STAT_ID_M (0x1F << ICE_AQ_VSI_SW_VEB_STAT_ID_S) +#define ICE_AQ_VSI_SW_VEB_STAT_ID_M (0x1F << ICE_AQ_VSI_SW_VEB_STAT_ID_S)#define ICE_AQ_VSI_SW_VEB_STAT_ID_VALID BIT(5)/* security section */ u8 sec_flags;#define ICE_AQ_VSI_SEC_FLAG_ALLOW_DEST_OVRD BIT(0)#define ICE_AQ_VSI_SEC_FLAG_ENA_MAC_ANTI_SPOOF BIT(2) -#define ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S 4 -#define ICE_AQ_VSI_SEC_TX_PRUNE_ENA_M (0xF << ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S) +#define ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S 4 +#define ICE_AQ_VSI_SEC_TX_PRUNE_ENA_M (0xF << ICE_AQ_VSI_SEC_TX_PRUNE_ENA_S)#define ICE_AQ_VSI_SEC_TX_VLAN_PRUNE_ENA BIT(0)u8 sec_reserved;/* VLAN section */ -__le16 pvid;/* VLANS include priority bits */ -u8 pvlan_reserved[2 ]; -u8 vlan_flags; -#define ICE_AQ_VSI_VLAN_MODE_S 0 -#define ICE_AQ_VSI_VLAN_MODE_M (0x3 << ICE_AQ_VSI_VLAN_MODE_S) -#define ICE_AQ_VSI_VLAN_MODE_UNTAGGED 0x1 -#define ICE_AQ_VSI_VLAN_MODE_TAGGED 0x2 -#define ICE_AQ_VSI_VLAN_MODE_ALL 0x3 -#define ICE_AQ_VSI_PVLAN_INSERT_PVID BIT(2) -#define ICE_AQ_VSI_VLAN_EMOD_S 3 -#define ICE_AQ_VSI_VLAN_EMOD_M (0x3 << ICE_AQ_VSI_VLAN_EMOD_S) -#define ICE_AQ_VSI_VLAN_EMOD_STR_BOTH (0x0 << ICE_AQ_VSI_VLAN_EMOD_S) -#define ICE_AQ_VSI_VLAN_EMOD_STR_UP (0x1 << ICE_AQ_VSI_VLAN_EMOD_S) -#define ICE_AQ_VSI_VLAN_EMOD_STR (0x2 << ICE_AQ_VSI_VLAN_EMOD_S) -#define ICE_AQ_VSI_VLAN_EMOD_NOTHING (0x3 << ICE_AQ_VSI_VLAN_EMOD_S) -u8 pvlan_reserved2[3 ]; +__le16 port_based_inner_vlan;/* VLANS include priority bits */ +u8 inner_vlan_reserved[2 ]; +u8 inner_vlan_flags; +#define ICE_AQ_VSI_INNER_VLAN_TX_MODE_S 0 +#define ICE_AQ_VSI_INNER_VLAN_TX_MODE_M (0x3 << ICE_AQ_VSI_INNER_VLAN_TX_MODE_S) +#define ICE_AQ_VSI_INNER_VLAN_TX_MODE_ACCEPTUNTAGGED 0x1 +#define ICE_AQ_VSI_INNER_VLAN_TX_MODE_ACCEPTTAGGED 0x2 +#define ICE_AQ_VSI_INNER_VLAN_TX_MODE_ALL 0x3 +#define ICE_AQ_VSI_INNER_VLAN_INSERT_PVID BIT(2) +#define ICE_AQ_VSI_INNER_VLAN_EMODE_S 3 +#define ICE_AQ_VSI_INNER_VLAN_EMODE_M (0x3 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) +#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_BOTH (0x0 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) +#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR_UP (0x1 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) +#define ICE_AQ_VSI_INNER_VLAN_EMODE_STR (0x2 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) +#define ICE_AQ_VSI_INNER_VLAN_EMODE_NOTHING (0x3 << ICE_AQ_VSI_INNER_VLAN_EMODE_S) +#define ICE_AQ_VSI_INNER_VLAN_BLOCK_TX_DESC BIT(5) +u8 inner_vlan_reserved2[3 ];/* ingress egress up sections */ __le32 ingress_table;/* bitmap, 3 bits per up */ -#define ICE_AQ_VSI_UP_TABLE_UP0_S 0 -#define ICE_AQ_VSI_UP_TABLE_UP0_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP0_S) -#define ICE_AQ_VSI_UP_TABLE_UP1_S 3 -#define ICE_AQ_VSI_UP_TABLE_UP1_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP1_S) -#define ICE_AQ_VSI_UP_TABLE_UP2_S 6 -#define ICE_AQ_VSI_UP_TABLE_UP2_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP2_S) -#define ICE_AQ_VSI_UP_TABLE_UP3_S 9 -#define ICE_AQ_VSI_UP_TABLE_UP3_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP3_S) -#define ICE_AQ_VSI_UP_TABLE_UP4_S 12 -#define ICE_AQ_VSI_UP_TABLE_UP4_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP4_S) -#define ICE_AQ_VSI_UP_TABLE_UP5_S 15 -#define ICE_AQ_VSI_UP_TABLE_UP5_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP5_S) -#define ICE_AQ_VSI_UP_TABLE_UP6_S 18 -#define ICE_AQ_VSI_UP_TABLE_UP6_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP6_S) -#define ICE_AQ_VSI_UP_TABLE_UP7_S 21 -#define ICE_AQ_VSI_UP_TABLE_UP7_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP7_S) +#define ICE_AQ_VSI_UP_TABLE_UP0_S 0 +#define ICE_AQ_VSI_UP_TABLE_UP0_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP0_S) +#define ICE_AQ_VSI_UP_TABLE_UP1_S 3 +#define ICE_AQ_VSI_UP_TABLE_UP1_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP1_S) +#define ICE_AQ_VSI_UP_TABLE_UP2_S 6 +#define ICE_AQ_VSI_UP_TABLE_UP2_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP2_S) +#define ICE_AQ_VSI_UP_TABLE_UP3_S 9 +#define ICE_AQ_VSI_UP_TABLE_UP3_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP3_S) +#define ICE_AQ_VSI_UP_TABLE_UP4_S 12 +#define ICE_AQ_VSI_UP_TABLE_UP4_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP4_S) +#define ICE_AQ_VSI_UP_TABLE_UP5_S 15 +#define ICE_AQ_VSI_UP_TABLE_UP5_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP5_S) +#define ICE_AQ_VSI_UP_TABLE_UP6_S 18 +#define ICE_AQ_VSI_UP_TABLE_UP6_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP6_S) +#define ICE_AQ_VSI_UP_TABLE_UP7_S 21 +#define ICE_AQ_VSI_UP_TABLE_UP7_M (0x7 << ICE_AQ_VSI_UP_TABLE_UP7_S)__le32 egress_table;/* same defines as for ingress table */ /* outer tags section */ -__le16 outer_tag; -u8 outer_tag_flags; -#define ICE_AQ_VSI_OUTER_TAG_MODE_S 0 -#define ICE_AQ_VSI_OUTER_TAG_MODE_M (0x3 << ICE_AQ_VSI_OUTER_TAG_MODE_S) -#define ICE_AQ_VSI_OUTER_TAG_NOTHING 0x0 -#define ICE_AQ_VSI_OUTER_TAG_REMOVE 0x1 -#define ICE_AQ_VSI_OUTER_TAG_COPY 0x2 -#define ICE_AQ_VSI_OUTER_TAG_TYPE_S 2 -#define ICE_AQ_VSI_OUTER_TAG_TYPE_M (0x3 << ICE_AQ_VSI_OUTER_TAG_TYPE_S) -#define ICE_AQ_VSI_OUTER_TAG_NONE 0x0 -#define ICE_AQ_VSI_OUTER_TAG_STAG 0x1 -#define ICE_AQ_VSI_OUTER_TAG_VLAN_8100 0x2 -#define ICE_AQ_VSI_OUTER_TAG_VLAN_9100 0x3 -#define ICE_AQ_VSI_OUTER_TAG_INSERT BIT(4) -#define ICE_AQ_VSI_OUTER_TAG_ACCEPT_HOST BIT(6) -u8 outer_tag_reserved; +__le16 port_based_outer_vlan; +u8 outer_vlan_flags; +#define ICE_AQ_VSI_OUTER_VLAN_EMODE_S 0 +#define ICE_AQ_VSI_OUTER_VLAN_EMODE_M (0x3 << ICE_AQ_VSI_OUTER_VLAN_EMODE_S) +#define ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW_BOTH 0x0 +#define ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW_UP 0x1 +#define ICE_AQ_VSI_OUTER_VLAN_EMODE_SHOW 0x2 +#define ICE_AQ_VSI_OUTER_VLAN_EMODE_NOTHING 0x3 +#define ICE_AQ_VSI_OUTER_TAG_TYPE_S 2 +#define ICE_AQ_VSI_OUTER_TAG_TYPE_M (0x3 << ICE_AQ_VSI_OUTER_TAG_TYPE_S) +#define ICE_AQ_VSI_OUTER_TAG_NONE 0x0 +#define ICE_AQ_VSI_OUTER_TAG_STAG 0x1 +#define ICE_AQ_VSI_OUTER_TAG_VLAN_8100 0x2 +#define ICE_AQ_VSI_OUTER_TAG_VLAN_9100 0x3 +#define ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_INSERT BIT(4) +#define ICE_AQ_VSI_OUTER_VLAN_PORT_BASED_ACCEPT_HOST BIT(4) +#define ICE_AQ_VSI_OUTER_VLAN_TX_MODE_S 5 +#define ICE_AQ_VSI_OUTER_VLAN_TX_MODE_M (0x3 << ICE_AQ_VSI_OUTER_VLAN_TX_MODE_S) +#define ICE_AQ_VSI_OUTER_VLAN_TX_MODE_ACCEPTUNTAGGED 0x1 +#define ICE_AQ_VSI_OUTER_VLAN_TX_MODE_ACCEPTTAGGED 0x2 +#define ICE_AQ_VSI_OUTER_VLAN_TX_MODE_ALL 0x3 +#define ICE_AQ_VSI_OUTER_VLAN_BLOCK_TX_DESC BIT(7) +u8 outer_vlan_reserved;/* queue mapping section */ __le16 mapping_flags; -#define ICE_AQ_VSI_Q_MAP_CONTIG 0x0 -#define ICE_AQ_VSI_Q_MAP_NONCONTIG BIT(0) +#define ICE_AQ_VSI_Q_MAP_CONTIG 0x0 +#define ICE_AQ_VSI_Q_MAP_NONCONTIG BIT(0)__le16 q_mapping[16 ]; -#define ICE_AQ_VSI_Q_S 0 -#define ICE_AQ_VSI_Q_M (0x7FF << ICE_AQ_VSI_Q_S) +#define ICE_AQ_VSI_Q_S 0 +#define ICE_AQ_VSI_Q_M (0x7FF << ICE_AQ_VSI_Q_S)__le16 tc_mapping[8 ]; -#define ICE_AQ_VSI_TC_Q_OFFSET_S 0 -#define ICE_AQ_VSI_TC_Q_OFFSET_M (0x7FF << ICE_AQ_VSI_TC_Q_OFFSET_S) -#define ICE_AQ_VSI_TC_Q_NUM_S 11 -#define ICE_AQ_VSI_TC_Q_NUM_M (0xF << ICE_AQ_VSI_TC_Q_NUM_S) +#define ICE_AQ_VSI_TC_Q_OFFSET_S 0 +#define ICE_AQ_VSI_TC_Q_OFFSET_M (0x7FF << ICE_AQ_VSI_TC_Q_OFFSET_S) +#define ICE_AQ_VSI_TC_Q_NUM_S 11 +#define ICE_AQ_VSI_TC_Q_NUM_M (0xF << ICE_AQ_VSI_TC_Q_NUM_S)/* queueing option section */ u8 q_opt_rss; -#define ICE_AQ_VSI_Q_OPT_RSS_LUT_S 0 -#define ICE_AQ_VSI_Q_OPT_RSS_LUT_M (0x3 << ICE_AQ_VSI_Q_OPT_RSS_LUT_S) -#define ICE_AQ_VSI_Q_OPT_RSS_LUT_VSI 0x0 -#define ICE_AQ_VSI_Q_OPT_RSS_LUT_PF 0x2 -#define ICE_AQ_VSI_Q_OPT_RSS_LUT_GBL 0x3 -#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S 2 -#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_M (0xF << ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S) -#define ICE_AQ_VSI_Q_OPT_RSS_HASH_S 6 -#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_TPLZ (0x0 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_SYM_TPLZ (0x1 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_XOR (0x2 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) -#define ICE_AQ_VSI_Q_OPT_RSS_JHASH (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_LUT_S 0 +#define ICE_AQ_VSI_Q_OPT_RSS_LUT_M (0x3 << ICE_AQ_VSI_Q_OPT_RSS_LUT_S) +#define ICE_AQ_VSI_Q_OPT_RSS_LUT_VSI 0x0 +#define ICE_AQ_VSI_Q_OPT_RSS_LUT_PF 0x2 +#define ICE_AQ_VSI_Q_OPT_RSS_LUT_GBL 0x3 +#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S 2 +#define ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_M (0xF << ICE_AQ_VSI_Q_OPT_RSS_GBL_LUT_S) +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_S 6 +#define ICE_AQ_VSI_Q_OPT_RSS_HASH_M (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_TPLZ (0x0 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_SYM_TPLZ (0x1 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_XOR (0x2 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S) +#define ICE_AQ_VSI_Q_OPT_RSS_JHASH (0x3 << ICE_AQ_VSI_Q_OPT_RSS_HASH_S)u8 q_opt_tc; -#define ICE_AQ_VSI_Q_OPT_TC_OVR_S 0 -#define ICE_AQ_VSI_Q_OPT_TC_OVR_M (0x1F << ICE_AQ_VSI_Q_OPT_TC_OVR_S) -#define ICE_AQ_VSI_Q_OPT_PROF_TC_OVR BIT(7) +#define ICE_AQ_VSI_Q_OPT_TC_OVR_S 0 +#define ICE_AQ_VSI_Q_OPT_TC_OVR_M (0x1F << ICE_AQ_VSI_Q_OPT_TC_OVR_S) +#define ICE_AQ_VSI_Q_OPT_PROF_TC_OVR BIT(7)u8 q_opt_flags; -#define ICE_AQ_VSI_Q_OPT_PE_FLTR_EN BIT(0) +#define ICE_AQ_VSI_Q_OPT_PE_FLTR_EN BIT(0)u8 q_opt_reserved[3 ];/* outer up section */ __le32 outer_up_table;/* same structure and defines as ingress tbl */ /* ACL section */ __le16 acl_def_act; -#define ICE_AQ_VSI_ACL_DEF_RX_PROF_S 0 -#define ICE_AQ_VSI_ACL_DEF_RX_PROF_M (0xF << ICE_AQ_VSI_ACL_DEF_RX_PROF_S) -#define ICE_AQ_VSI_ACL_DEF_RX_TABLE_S 4 -#define ICE_AQ_VSI_ACL_DEF_RX_TABLE_M (0xF << ICE_AQ_VSI_ACL_DEF_RX_TABLE_S) -#define ICE_AQ_VSI_ACL_DEF_TX_PROF_S 8 -#define ICE_AQ_VSI_ACL_DEF_TX_PROF_M (0xF << ICE_AQ_VSI_ACL_DEF_TX_PROF_S) -#define ICE_AQ_VSI_ACL_DEF_TX_TABLE_S 12 -#define ICE_AQ_VSI_ACL_DEF_TX_TABLE_M (0xF << ICE_AQ_VSI_ACL_DEF_TX_TABLE_S) +#define ICE_AQ_VSI_ACL_DEF_RX_PROF_S 0 +#define ICE_AQ_VSI_ACL_DEF_RX_PROF_M (0xF << ICE_AQ_VSI_ACL_DEF_RX_PROF_S) +#define ICE_AQ_VSI_ACL_DEF_RX_TABLE_S 4 +#define ICE_AQ_VSI_ACL_DEF_RX_TABLE_M (0xF << ICE_AQ_VSI_ACL_DEF_RX_TABLE_S) +#define ICE_AQ_VSI_ACL_DEF_TX_PROF_S 8 +#define ICE_AQ_VSI_ACL_DEF_TX_PROF_M (0xF << ICE_AQ_VSI_ACL_DEF_TX_PROF_S) +#define ICE_AQ_VSI_ACL_DEF_TX_TABLE_S 12 +#define ICE_AQ_VSI_ACL_DEF_TX_TABLE_M (0xF << ICE_AQ_VSI_ACL_DEF_TX_TABLE_S)/* flow director section */ __le16 fd_options; -#define ICE_AQ_VSI_FD_ENABLE BIT(0) -#define ICE_AQ_VSI_FD_TX_AUTO_ENABLE BIT(1) -#define ICE_AQ_VSI_FD_PROG_ENABLE BIT(3) +#define ICE_AQ_VSI_FD_ENABLE BIT(0) +#define ICE_AQ_VSI_FD_TX_AUTO_ENABLE BIT(1) +#define ICE_AQ_VSI_FD_PROG_ENABLE BIT(3)__le16 max_fd_fltr_dedicated;__le16 max_fd_fltr_shared;__le16 fd_def_q; -#define ICE_AQ_VSI_FD_DEF_Q_S 0 -#define ICE_AQ_VSI_FD_DEF_Q_M (0x7FF << ICE_AQ_VSI_FD_DEF_Q_S) -#define ICE_AQ_VSI_FD_DEF_GRP_S 12 -#define ICE_AQ_VSI_FD_DEF_GRP_M (0x7 << ICE_AQ_VSI_FD_DEF_GRP_S) +#define ICE_AQ_VSI_FD_DEF_Q_S 0 +#define ICE_AQ_VSI_FD_DEF_Q_M (0x7FF << ICE_AQ_VSI_FD_DEF_Q_S) +#define ICE_AQ_VSI_FD_DEF_GRP_S 12 +#define ICE_AQ_VSI_FD_DEF_GRP_M (0x7 << ICE_AQ_VSI_FD_DEF_GRP_S)__le16 fd_report_opt; -#define ICE_AQ_VSI_FD_REPORT_Q_S 0 -#define ICE_AQ_VSI_FD_REPORT_Q_M (0x7FF << ICE_AQ_VSI_FD_REPORT_Q_S) -#define ICE_AQ_VSI_FD_DEF_PRIORITY_S 12 -#define ICE_AQ_VSI_FD_DEF_PRIORITY_M (0x7 << ICE_AQ_VSI_FD_DEF_PRIORITY_S) -#define ICE_AQ_VSI_FD_DEF_DROP BIT(15) +#define ICE_AQ_VSI_FD_REPORT_Q_S 0 +#define ICE_AQ_VSI_FD_REPORT_Q_M (0x7FF << ICE_AQ_VSI_FD_REPORT_Q_S) +#define ICE_AQ_VSI_FD_DEF_PRIORITY_S 12 +#define ICE_AQ_VSI_FD_DEF_PRIORITY_M (0x7 << ICE_AQ_VSI_FD_DEF_PRIORITY_S) +#define ICE_AQ_VSI_FD_DEF_DROP BIT(15)/* PASID section */ __le32 pasid_id; -#define ICE_AQ_VSI_PASID_ID_S 0 -#define ICE_AQ_VSI_PASID_ID_M (0xFFFFF << ICE_AQ_VSI_PASID_ID_S) -#define ICE_AQ_VSI_PASID_ID_VALID BIT(31) +#define ICE_AQ_VSI_PASID_ID_S 0 +#define ICE_AQ_VSI_PASID_ID_M (0xFFFFF << ICE_AQ_VSI_PASID_ID_S) +#define ICE_AQ_VSI_PASID_ID_VALID BIT(31)u8 reserved[24 ]; };
drivers/net/ice/ice_ethdev.c +44 -44
155 lines not on this page · raw message
Signature · 1 line
2.26.2
PATCH 2/9 net/ice/base: remove the deprecated field
In reply to Qi Zhanghw_vsi_id is used to replace vsi_id, so remove the deprecated vsi_id.
--- drivers/net/ice/base/ice_switch.h | 1 - 1 file changed, 1 deletion(-)
drivers/net/ice/base/ice_switch.h +0 -1
@@ -182,7 +182,6 @@ struct ice_fltr_info {*/ u16 q_id:11; u16 hw_vsi_id:10; - u16 vsi_id:10; u16 vsi_list_id:10; } fwd_id;
Signature · 1 line
2.26.2
PATCH 3/9 net/ice/base: add package PTYPE enable information
In reply to Qi ZhangScan the 'Marker PType TCAM' session to retrieve the Rx parser PTYPE enable information from the current package.
--- drivers/net/ice/base/ice_flex_pipe.c | 79 ++++++++++++++++++++++++++++ drivers/net/ice/base/ice_flex_pipe.h | 3 ++ drivers/net/ice/base/ice_flex_type.h | 19 +++++++ drivers/net/ice/base/ice_type.h | 1 + 4 files changed, 102 insertions(+)
drivers/net/ice/base/ice_flex_pipe.c +79 -0
@@ -316,6 +316,84 @@ ice_pkg_enum_entry(struct ice_seg *ice_seg, struct ice_pkg_enum *state,return entry; } +/** +* ice_hw_ptype_ena - check if the PTYPE is enabled or not +* @hw: pointer to the HW structure +* @ptype: the hardware PTYPE +*/ +bool ice_hw_ptype_ena (struct ice_hw *hw,u16 ptype) +{ +return ptype <ICE_FLOW_PTYPE_MAX && +ice_is_bit_set (hw->hw_ptype, ptype); +} + +/** +* ice_marker_ptype_tcam_handler +* @sect_type: section type +* @section: pointer to section +* @index: index of the Marker PType TCAM entry to be returned +* @offset: pointer to receive absolute offset, always 0 for ptype TCAM sections +* +* This is a callback function that can be passed to ice_pkg_enum_entry. +* Handles enumeration of individual Marker PType TCAM entries. +*/ +static void * +ice_marker_ptype_tcam_handler (u32 sect_type,void *section,u32 index, +u32 *offset) +{ +struct ice_marker_ptype_tcam_section *marker_ptype; + +if (!section) +return NULL ; + +if (sect_type !=ICE_SID_RXPARSER_MARKER_PTYPE ) +return NULL ; + +/* cppcheck-suppress nullPointer */ +if (index >ICE_MAX_MARKER_PTYPE_TCAMS_IN_BUF ) +return NULL ; + +if (offset) + *offset =0 ; + + marker_ptype = (struct ice_marker_ptype_tcam_section *)section; +if (index >=LE16_TO_CPU (marker_ptype->count)) +return NULL ; + +return marker_ptype->tcam + index; +} + +/** +* ice_fill_hw_ptype - fill the enabled PTYPE bit information +* @hw: pointer to the HW structure +*/ +static void +ice_fill_hw_ptype (struct ice_hw *hw) +{ +struct ice_marker_ptype_tcam_entry *tcam; +struct ice_seg *seg = hw->seg; +struct ice_pkg_enum state; + +ice_zero_bitmap (hw->hw_ptype,ICE_FLOW_PTYPE_MAX ); +if (!seg) +return ; + +ice_memset (&state,0 ,sizeof (state),ICE_NONDMA_MEM ); + +do { + tcam = (struct ice_marker_ptype_tcam_entry *) +ice_pkg_enum_entry (seg, &state, +ICE_SID_RXPARSER_MARKER_PTYPE ,NULL , + ice_marker_ptype_tcam_handler); +if (tcam && +LE16_TO_CPU (tcam->addr) <ICE_MARKER_PTYPE_TCAM_ADDR_MAX && +LE16_TO_CPU (tcam->ptype) <ICE_FLOW_PTYPE_MAX ) +ice_set_bit (LE16_TO_CPU (tcam->ptype), hw->hw_ptype); + + seg =NULL ; + }while (tcam); +} +/** * ice_boost_tcam_handler * @sect_type: section type
@@ -1541,6 +1619,7 @@ enum ice_status ice_init_pkg(struct ice_hw *hw, u8 *buf, u32 len)*/ ice_init_pkg_regs (hw);ice_fill_blk_tbls (hw); +ice_fill_hw_ptype (hw);ice_get_prof_index_max (hw); }else { ice_debug(hw, ICE_DBG_INIT, "package load failed, %d\n",
drivers/net/ice/base/ice_flex_pipe.h +3 -0
@@ -54,6 +54,9 @@ bool ice_tunnel_port_in_use(struct ice_hw *hw, u16 port, u16 *index);bool ice_tunnel_get_type (struct ice_hw *hw,u16 port,enum ice_tunnel_type *type); +/* RX parser PType functions */ +bool ice_hw_ptype_ena (struct ice_hw *hw,u16 ptype); +/* XLT2/VSI group functions */ enum ice_status ice_vsig_find_vsi (struct ice_hw *hw,enum ice_block blk,u16 vsi,u16 *vsig);
drivers/net/ice/base/ice_flex_type.h +19 -0
@@ -472,6 +472,25 @@ struct ice_boost_tcam_section { sizeof(struct ice_boost_tcam_entry), \ sizeof(struct ice_boost_tcam_entry)) +/* package Marker PType TCAM entry */ +struct ice_marker_ptype_tcam_entry { +#define ICE_MARKER_PTYPE_TCAM_ADDR_MAX 1024 +__le16 addr; +__le16 ptype; +u8 keys[20 ]; +}; + +struct ice_marker_ptype_tcam_section { +__le16 count; +__le16 reserved; +struct ice_marker_ptype_tcam_entry tcam[STRUCT_HACK_VAR_LEN ]; +}; + +#define ICE_MAX_MARKER_PTYPE_TCAMS_IN_BUF ICE_MAX_ENTRIES_IN_BUF( \ + ice_struct_size((struct ice_marker_ptype_tcam_section *)0, tcam, 1) - \ + sizeof(struct ice_marker_ptype_tcam_entry), \ + sizeof(struct ice_marker_ptype_tcam_entry)) +struct ice_xlt1_section {__le16 count;__le16 offset;
drivers/net/ice/base/ice_type.h +1 -0
@@ -995,6 +995,7 @@ struct ice_hw {struct ice_lock rss_locks;/* protect RSS configuration */ struct LIST_HEAD_TYPE rss_list_head;struct ice_vlan_mode_ops vlan_mode_ops; +ice_declare_bitmap (hw_ptype,ICE_FLOW_PTYPE_MAX ); };/* Statistics collected by each port, VSI, VEB, and S-channel */
Signature · 1 line
2.26.2
PATCH 4/9 net/ice/base: fix for memory handling
In reply to Qi ZhangFixed memory handling when memory allocated in user space was handled as memory allocated in kernel space within QV os_dep implementation of the ice_memdup function.
--- drivers/net/ice/base/ice_sched.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/ice/base/ice_sched.c +1 -1
@@ -1361,7 +1361,7 @@ enum ice_status ice_sched_query_res_alloc(struct ice_hw *hw)ice_memdup (hw, buf->layer_props, (hw->num_tx_sched_layers *sizeof (*hw->layer_info)), -ICE_DMA_TO_DMA ); +ICE_NONDMA_TO_NONDMA );if (!hw->layer_info) { status =ICE_ERR_NO_MEMORY ; goto sched_query_out;
Signature · 1 line
2.26.2
PATCH 5/9 net/ice/base: limit forced overrides based on FW version
In reply to Qi ZhangBeyond a specific version of firmware, there is no need to provide override values to the firmware when setting PHY capabilities. In this case, we do not need to indicate whether we're in Strict or Lenient Link Mode.
In the case of translating capabilities to the configuration structure, the module compliance enforcement is already correctly set by firmware, so the extra code block is redundant.
--- drivers/net/ice/base/ice_common.c | 14 ++------------ 1 file changed, 2 insertions(+), 12 deletions(-)
drivers/net/ice/base/ice_common.c +2 -12
@@ -3088,17 +3088,6 @@ ice_copy_phy_caps_to_cfg(struct ice_port_info *pi, cfg->link_fec_opt = caps->link_fec_options; cfg->module_compliance_enforcement = caps->module_compliance_enforcement; - -if (ice_fw_supports_link_override (pi->hw)) { -struct ice_link_default_override_tlv tlv; - -if (ice_get_link_default_override (&tlv, pi)) -return ; - -if (tlv.options &ICE_LINK_OVERRIDE_STRICT_MODE ) - cfg->module_compliance_enforcement |= -ICE_LINK_OVERRIDE_STRICT_MODE ; - } }/**
@@ -3168,7 +3157,8 @@ ice_cfg_phy_fec(struct ice_port_info *pi, struct ice_aqc_set_phy_cfg_data *cfg,break ; } -if (fec ==ICE_FEC_AUTO &&ice_fw_supports_link_override (pi->hw)) { +if (fec ==ICE_FEC_AUTO &&ice_fw_supports_link_override (pi->hw) && + !ice_fw_supports_report_dflt_cfg (pi->hw)) {struct ice_link_default_override_tlv tlv;if (ice_get_link_default_override (&tlv, pi))
Signature · 1 line
2.26.2
PATCH 6/9 net/ice/base: support GTPU inner for AVF FDIR
In reply to Qi ZhangAdd dummy packets for IPV4_GTPU with inner IPV4/UDP/TCP with all kinds of GTPU (EH) type (i.e., IP/EH/DL/UL) for AVF FDIR.
--- drivers/net/ice/base/ice_fdir.c | 355 +++++++++++++++++++++++++++++--- drivers/net/ice/base/ice_type.h | 18 ++ 2 files changed, 342 insertions(+), 31 deletions(-)
drivers/net/ice/base/ice_fdir.c +324 -31
@@ -57,6 +57,18 @@ static const u8 ice_fdir_udp4_vxlan_pkt[] = { 0x00, 0x00, 0x00, 0x00, }; +static const u8 ice_fdir_ipv4_gtpu4_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x38 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x7c ,0xb2 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x24 , +0xbf ,0xc0 ,0x30 ,0xff ,0x00 ,0x14 ,0x00 ,0x00 , +0x00 ,0x00 ,0x45 ,0x00 ,0x00 ,0x14 ,0x00 ,0x01 , +0x00 ,0x00 ,0x40 ,0x00 ,0x3a ,0x3d ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +}; +static const u8 ice_fdir_udp4_gtpu4_pkt[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 ,
@@ -88,6 +100,143 @@ static const u8 ice_fdir_tcp4_gtpu4_pkt[] = { 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, }; +static const u8 ice_fdir_ipv4_gtpu4_eh_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x44 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xfb ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x30 , +0x76 ,0x6c ,0x34 ,0xff ,0x00 ,0x20 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x14 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x00 , +0x3a ,0x3d ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_udp4_gtpu4_eh_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x4c ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xf3 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x38 , +0xb7 ,0x1a ,0x34 ,0xff ,0x00 ,0x28 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x1c ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x3a ,0x24 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 , +0xbe ,0xc7 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_tcp4_gtpu4_eh_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x58 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xe7 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x44 , +0xb6 ,0xf7 ,0x34 ,0xff ,0x00 ,0x34 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x28 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x06 , +0x3a ,0x23 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x50 ,0x02 , +0x20 ,0x00 ,0x4e ,0xd2 ,0x00 ,0x00 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_ipv4_gtpu4_eh_dw_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x58 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xe7 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x44 , +0xb6 ,0xf7 ,0x34 ,0xff ,0x00 ,0x34 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x28 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x06 , +0x3a ,0x23 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x50 ,0x02 , +0x20 ,0x00 ,0x4e ,0xd2 ,0x00 ,0x00 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_udp4_gtpu4_eh_dw_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x4c ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xf3 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x38 , +0xb7 ,0x1a ,0x34 ,0xff ,0x00 ,0x28 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x1c ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x3a ,0x24 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 , +0xbe ,0xc7 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_tcp4_gtpu4_eh_dw_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x58 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xe7 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x44 , +0xb6 ,0xf7 ,0x34 ,0xff ,0x00 ,0x34 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x28 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x06 , +0x3a ,0x23 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x50 ,0x02 , +0x20 ,0x00 ,0x4e ,0xd2 ,0x00 ,0x00 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_ipv4_gtpu4_eh_up_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x44 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xfb ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x30 , +0x76 ,0x5c ,0x34 ,0xff ,0x00 ,0x20 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x10 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x14 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x00 , +0x3a ,0x3d ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_udp4_gtpu4_eh_up_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x4c ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xf3 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x38 , +0xb7 ,0x0a ,0x34 ,0xff ,0x00 ,0x28 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x10 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x1c ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x3a ,0x24 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 , +0xbe ,0xc7 ,0x00 ,0x00 , +}; + +static const u8 ice_fdir_tcp4_gtpu4_eh_up_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , +0x00 ,0x58 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x11 , +0x39 ,0xe7 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x44 , +0xb6 ,0xe7 ,0x34 ,0xff ,0x00 ,0x34 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x10 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , +0x00 ,0x28 ,0x00 ,0x01 ,0x00 ,0x00 ,0x40 ,0x06 , +0x3a ,0x23 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x50 ,0x02 , +0x20 ,0x00 ,0x4e ,0xd2 ,0x00 ,0x00 ,0x00 ,0x00 , +}; +static const u8 ice_fdir_icmp4_gtpu4_pkt[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 ,
@@ -103,68 +252,78 @@ static const u8 ice_fdir_icmp4_gtpu4_pkt[] = { 0x00, 0x00, }; -static const u8 ice_fdir_ipv4_gtpu4_pkt[] = { +static const u8 ice_fdir_ipv6_gtpu6_pkt[] = { +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x86 ,0xdd ,0x60 ,0x00 , +0x00 ,0x00 ,0x00 ,0x38 ,0x11 ,0x40 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x68 , +0x08 ,0x68 ,0x00 ,0x38 ,0x22 ,0x43 ,0x30 ,0xff , +0x00 ,0x28 ,0x00 ,0x00 ,0x00 ,0x00 ,0x60 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x3b ,0x40 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , -0x00 ,0x44 ,0x00 ,0x00 ,0x40 ,0x00 ,0x40 ,0x11 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x00 , -0x00 ,0x00 ,0x33 ,0xff ,0x00 ,0x20 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x45 ,0x00 , -0x00 ,0x14 ,0x00 ,0x00 ,0x40 ,0x00 ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 , }; -static const u8 ice_fdir_ipv6_gtpu6_pkt[] = { +static const u8 ice_fdir_ipv6_gtpu6_eh_pkt[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x86 ,0xdd ,0x60 ,0x00 ,0x00 ,0x00 ,0x00 ,0x44 ,0x11 ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x01 ,0x08 ,0x68 , -0x08 ,0x68 ,0x00 ,0x44 ,0x7f ,0xed ,0x33 ,0xff , -0x00 ,0x34 ,0x12 ,0x34 ,0x56 ,0x78 ,0x00 ,0x00 , -0x00 ,0x85 ,0x60 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x68 , +0x08 ,0x68 ,0x00 ,0x44 ,0x1b ,0x9a ,0x34 ,0xff , +0x00 ,0x34 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x85 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x60 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x3b ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 , }; -static const u8 ice_fdir_ipv4_gtpu4_eh_pkt[] = { +static const u8 ice_fdir_ipv6_gtpu6_eh_dw_pkt[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x00 ,0x45 ,0x00 , -0x00 ,0x44 ,0x00 ,0x00 ,0x40 ,0x00 ,0x40 ,0x11 , +0x00 ,0x00 ,0x00 ,0x00 ,0x86 ,0xdd ,0x60 ,0x00 , +0x00 ,0x00 ,0x00 ,0x44 ,0x11 ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x08 ,0x68 ,0x08 ,0x68 ,0x00 ,0x00 , -0x00 ,0x00 ,0x34 ,0xff ,0x00 ,0x28 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x85 ,0x02 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x45 ,0x00 , -0x00 ,0x14 ,0x00 ,0x00 ,0x40 ,0x00 ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x68 , +0x08 ,0x68 ,0x00 ,0x44 ,0x1b ,0x9a ,0x34 ,0xff , +0x00 ,0x34 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x85 ,0x02 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x60 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x3b ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 , }; -static const u8 ice_fdir_ipv6_gtpu6_eh_pkt[] = { +static const u8 ice_fdir_ipv6_gtpu6_eh_up_pkt[] = {0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x86 ,0xdd ,0x60 ,0x00 ,0x00 ,0x00 ,0x00 ,0x44 ,0x11 ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x01 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x01 ,0x08 ,0x68 , -0x08 ,0x68 ,0x00 ,0x44 ,0x7f ,0xed ,0x34 ,0xff , -0x00 ,0x34 ,0x12 ,0x34 ,0x56 ,0x78 ,0x00 ,0x00 , -0x00 ,0x85 ,0x02 ,0x00 ,0x33 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x08 ,0x68 , +0x08 ,0x68 ,0x00 ,0x44 ,0x1b ,0x8a ,0x34 ,0xff , +0x00 ,0x34 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , +0x00 ,0x85 ,0x02 ,0x10 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x60 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x3b ,0x40 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 ,0x00 , -0x00 ,0x00 , +0x00 ,0x00 ,0x00 ,0x00 , };static const u8 ice_fdir_ipv4_l2tpv3_pkt[] = {
@@ -520,6 +679,41 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {sizeof (ice_fdir_ipv4_pkt), ice_fdir_ipv4_pkt,sizeof (ice_fdir_ip4_tun_pkt), ice_fdir_ip4_tun_pkt, }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU , +sizeof (ice_fdir_ipv4_gtpu4_pkt), + ice_fdir_ipv4_gtpu4_pkt, +sizeof (ice_fdir_ipv4_gtpu4_pkt), + ice_fdir_ipv4_gtpu4_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH , +sizeof (ice_fdir_ipv4_gtpu4_eh_pkt), + ice_fdir_ipv4_gtpu4_eh_pkt, +sizeof (ice_fdir_ipv4_gtpu4_eh_pkt), + ice_fdir_ipv4_gtpu4_eh_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW , +sizeof (ice_fdir_ipv4_gtpu4_eh_dw_pkt), + ice_fdir_ipv4_gtpu4_eh_dw_pkt, +sizeof (ice_fdir_ipv4_gtpu4_eh_dw_pkt), + ice_fdir_ipv4_gtpu4_eh_dw_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP , +sizeof (ice_fdir_ipv4_gtpu4_eh_up_pkt), + ice_fdir_ipv4_gtpu4_eh_up_pkt, +sizeof (ice_fdir_ipv4_gtpu4_eh_up_pkt), + ice_fdir_ipv4_gtpu4_eh_up_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4 , +sizeof (ice_fdir_ipv4_gtpu4_pkt), + ice_fdir_ipv4_gtpu4_pkt, +sizeof (ice_fdir_ipv4_gtpu4_pkt), + ice_fdir_ipv4_gtpu4_pkt, + }, {ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP , sizeof(ice_fdir_udp4_gtpu4_pkt),
@@ -534,6 +728,69 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {sizeof (ice_fdir_tcp4_gtpu4_pkt), ice_fdir_tcp4_gtpu4_pkt, }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4 , +sizeof (ice_fdir_ipv4_gtpu4_eh_pkt), + ice_fdir_ipv4_gtpu4_eh_pkt, +sizeof (ice_fdir_ipv4_gtpu4_eh_pkt), + ice_fdir_ipv4_gtpu4_eh_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_UDP , +sizeof (ice_fdir_udp4_gtpu4_eh_pkt), + ice_fdir_udp4_gtpu4_eh_pkt, +sizeof (ice_fdir_udp4_gtpu4_eh_pkt), + ice_fdir_udp4_gtpu4_eh_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_TCP , +sizeof (ice_fdir_tcp4_gtpu4_eh_pkt), + ice_fdir_tcp4_gtpu4_eh_pkt, +sizeof (ice_fdir_tcp4_gtpu4_eh_pkt), + ice_fdir_tcp4_gtpu4_eh_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4 , +sizeof (ice_fdir_ipv4_gtpu4_eh_dw_pkt), + ice_fdir_ipv4_gtpu4_eh_dw_pkt, +sizeof (ice_fdir_ipv4_gtpu4_eh_dw_pkt), + ice_fdir_ipv4_gtpu4_eh_dw_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_UDP , +sizeof (ice_fdir_udp4_gtpu4_eh_dw_pkt), + ice_fdir_udp4_gtpu4_eh_dw_pkt, +sizeof (ice_fdir_udp4_gtpu4_eh_dw_pkt), + ice_fdir_udp4_gtpu4_eh_dw_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_TCP , +sizeof (ice_fdir_tcp4_gtpu4_eh_dw_pkt), + ice_fdir_tcp4_gtpu4_eh_dw_pkt, +sizeof (ice_fdir_tcp4_gtpu4_eh_dw_pkt), + ice_fdir_tcp4_gtpu4_eh_dw_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4 , +sizeof (ice_fdir_ipv4_gtpu4_eh_up_pkt), + ice_fdir_ipv4_gtpu4_eh_up_pkt, +sizeof (ice_fdir_ipv4_gtpu4_eh_up_pkt), + ice_fdir_ipv4_gtpu4_eh_up_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_UDP , +sizeof (ice_fdir_udp4_gtpu4_eh_up_pkt), + ice_fdir_udp4_gtpu4_eh_up_pkt, +sizeof (ice_fdir_udp4_gtpu4_eh_up_pkt), + ice_fdir_udp4_gtpu4_eh_up_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_TCP , +sizeof (ice_fdir_tcp4_gtpu4_eh_up_pkt), + ice_fdir_tcp4_gtpu4_eh_up_pkt, +sizeof (ice_fdir_tcp4_gtpu4_eh_up_pkt), + ice_fdir_tcp4_gtpu4_eh_up_pkt, + }, {ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP , sizeof(ice_fdir_icmp4_gtpu4_pkt),
@@ -548,6 +805,34 @@ static const struct ice_fdir_base_pkt ice_fdir_pkt[] = {sizeof (ice_fdir_ipv4_gtpu4_pkt), ice_fdir_ipv4_gtpu4_pkt, }, + { +ICE_FLTR_PTYPE_NONF_IPV6_GTPU , +sizeof (ice_fdir_ipv6_gtpu6_pkt), + ice_fdir_ipv6_gtpu6_pkt, +sizeof (ice_fdir_ipv6_gtpu6_pkt), + ice_fdir_ipv6_gtpu6_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH , +sizeof (ice_fdir_ipv6_gtpu6_eh_pkt), + ice_fdir_ipv6_gtpu6_eh_pkt, +sizeof (ice_fdir_ipv6_gtpu6_eh_pkt), + ice_fdir_ipv6_gtpu6_eh_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_DW , +sizeof (ice_fdir_ipv6_gtpu6_eh_dw_pkt), + ice_fdir_ipv6_gtpu6_eh_dw_pkt, +sizeof (ice_fdir_ipv6_gtpu6_eh_dw_pkt), + ice_fdir_ipv6_gtpu6_eh_dw_pkt, + }, + { +ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_UP , +sizeof (ice_fdir_ipv6_gtpu6_eh_up_pkt), + ice_fdir_ipv6_gtpu6_eh_up_pkt, +sizeof (ice_fdir_ipv6_gtpu6_eh_up_pkt), + ice_fdir_ipv6_gtpu6_eh_up_pkt, + }, {ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER , sizeof(ice_fdir_ipv6_gtpu6_pkt),
@@ -1205,6 +1490,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,ice_pkt_insert_mac_addr (loc, input->ext_data.dst_mac);ice_pkt_insert_mac_addr (loc +ETH_ALEN , input->ext_data.src_mac);break ; +case ICE_FLTR_PTYPE_NONF_IPV4_GTPU :case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER :ice_pkt_insert_u32 (loc,ICE_IPV4_DST_ADDR_OFFSET , input->ip.v4.src_ip);
@@ -1213,6 +1499,9 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,ice_pkt_insert_u32 (loc,ICE_IPV4_GTPU_TEID_OFFSET , input->gtpu_data.teid);break ; +case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH : +case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW : +case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP :case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP :case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP :case ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP :
@@ -1226,6 +1515,7 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,ice_pkt_insert_u6_qfi (loc,ICE_IPV4_GTPU_QFI_OFFSET , input->gtpu_data.qfi);break ; +case ICE_FLTR_PTYPE_NONF_IPV6_GTPU :case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER :ice_pkt_insert_ipv6_addr (loc,ICE_IPV6_DST_ADDR_OFFSET , input->ip.v6.src_ip);
@@ -1234,6 +1524,9 @@ ice_fdir_get_gen_prgm_pkt(struct ice_hw *hw, struct ice_fdir_fltr *input,ice_pkt_insert_u32 (loc,ICE_IPV6_GTPU_TEID_OFFSET , input->gtpu_data.teid);break ; +case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH : +case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_DW : +case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_UP :case ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_IPV6_OTHER :ice_pkt_insert_ipv6_addr (loc,ICE_IPV6_DST_ADDR_OFFSET , input->ip.v6.src_ip);
drivers/net/ice/base/ice_type.h +18 -0
@@ -304,8 +304,26 @@ enum ice_fltr_ptype {ICE_FLTR_PTYPE_NONF_IPV4_TCP ,ICE_FLTR_PTYPE_NONF_IPV4_SCTP ,ICE_FLTR_PTYPE_NONF_IPV4_OTHER , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP , +ICE_FLTR_PTYPE_NONF_IPV6_GTPU , +ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH , +ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_DW , +ICE_FLTR_PTYPE_NONF_IPV6_GTPU_EH_UP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4 ,ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_UDP ,ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_TCP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4 , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_UDP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_IPV4_TCP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4 , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_UDP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_DW_IPV4_TCP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4 , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_UDP , +ICE_FLTR_PTYPE_NONF_IPV4_GTPU_EH_UP_IPV4_TCP ,ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_ICMP ,ICE_FLTR_PTYPE_NONF_IPV4_GTPU_IPV4_OTHER , ICE_FLTR_PTYPE_NONF_IPV6_GTPU_IPV6_OTHER,
Signature · 1 line
2.26.2
PATCH 7/9 net/ice/base: cleanup style issues
In reply to Qi ZhangA few style issues reported by checkpatch have snuck into the code, resolve the style issues.
PARENTHESIS_ALIGNMENT: Alignment should match open parenthesisCOMPLEX_MACRO: Macros with complex values should be enclosed in parentheses
--- drivers/net/ice/base/ice_controlq.h | 4 ++-- drivers/net/ice/base/ice_flex_type.h | 4 ++-- drivers/net/ice/base/ice_flow.c | 6 +++--- drivers/net/ice/base/ice_sched.c | 2 +- 4 files changed, 8 insertions(+), 8 deletions(-)
drivers/net/ice/base/ice_controlq.h +2 -2
@@ -15,8 +15,8 @@ (&(((struct ice_aq_desc *)((R).desc_buf.va))[i]))#define ICE_CTL_Q_DESC_UNUSED (R ) \ - (u16)((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \ - (R)->next_to_clean - (R)->next_to_use - 1) + ((u16)((((R)->next_to_clean > (R)->next_to_use) ? 0 : (R)->count) + \ + (R)->next_to_clean - (R)->next_to_use - 1))/* Defines that help manage the driver vs FW API checks. * Take a look at ice_aq_ver_check in ice_controlq.c for actual usage.
drivers/net/ice/base/ice_flex_type.h +2 -2
@@ -670,8 +670,8 @@ struct ice_xlt1 {#define ICE_PF_NUM_S 13#define ICE_PF_NUM_M (0x07 << ICE_PF_NUM_S)#define ICE_VSIG_VALUE (vsig, pf_id) \ - (u16)((((u16)(vsig)) & ICE_VSIG_IDX_M) | \ - (((u16)(pf_id) << ICE_PF_NUM_S) & ICE_PF_NUM_M)) + ((u16)((((u16)(vsig)) & ICE_VSIG_IDX_M) | \ + (((u16)(pf_id) << ICE_PF_NUM_S) & ICE_PF_NUM_M)))#define ICE_DEFAULT_VSIG 0/* XLT2 Table */
drivers/net/ice/base/ice_flow.c +3 -3
@@ -3533,9 +3533,9 @@ ice_add_rss_list(struct ice_hw *hw, u16 vsi_handle, struct ice_flow_prof *prof)* 3 for tunneled with outer ipv6 */ #define ICE_FLOW_GEN_PROFID (hash, hdr, encap) \ - (u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ - (((u64)(hdr) << ICE_FLOW_PROF_HDR_S) & ICE_FLOW_PROF_HDR_M) | \ - (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & ICE_FLOW_PROF_ENCAP_M)) + ((u64)(((u64)(hash) & ICE_FLOW_PROF_HASH_M) | \ + (((u64)(hdr) << ICE_FLOW_PROF_HDR_S) & ICE_FLOW_PROF_HDR_M) | \ + (((u64)(encap) << ICE_FLOW_PROF_ENCAP_S) & ICE_FLOW_PROF_ENCAP_M)))static void ice_rss_config_xor_word (struct ice_hw *hw,u8 prof_id,u8 src,u8 dst)
drivers/net/ice/base/ice_sched.c +1 -1
@@ -4289,7 +4289,7 @@ ice_sched_set_node_bw_lmt(struct ice_port_info *pi, struct ice_sched_node *node,ice_sched_rm_unused_rl_prof (hw); layer_num =ice_sched_get_rl_prof_layer (pi, rl_type, - node->tx_sched_layer); + node->tx_sched_layer);if (layer_num >= hw->num_tx_sched_layers)return ICE_ERR_PARAM ;
Signature · 1 line
2.26.2
PATCH 8/9 net/ice/base: updated the add scheduler node counter
In reply to Qi ZhangThe number of nodes added counter was updated incorrectly. This issue was exposed when the driver tried to add more than 128 queues per TC.
Fix added to update the counter correctly.
--- drivers/net/ice/base/ice_sched.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-)
drivers/net/ice/base/ice_sched.c +10 -2
@@ -1040,7 +1040,15 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi, layer, new_num_nodes, first_teid_ptr, &num_added); - *num_nodes_added += num_added; +if (status ==ICE_SUCCESS ) + *num_nodes_added += num_added; +/* added more nodes than requested ? */ +if (*num_nodes_added > num_nodes) { +ice_debug (pi->hw,ICE_DBG_SCHED ,"added extra nodes %d %d\n" , num_nodes, + *num_nodes_added); + status =ICE_ERR_CFG ; +break ; + }/* break if all the nodes are added successfully */ if (status ==ICE_SUCCESS && (*num_nodes_added == num_nodes))break ;
@@ -1063,7 +1071,7 @@ ice_sched_add_nodes_to_layer(struct ice_port_info *pi,if (num_added) first_teid_ptr = &temp; - new_num_nodes = num_nodes - num_added; + new_num_nodes = num_nodes - *num_nodes_added; } }return status;
Signature · 1 line
2.26.2
PATCH 9/9 net/ice/base: update Copyright date
In reply to Qi ZhangUpdated the Copyright for 2021
Updated FreeBSD ice driver version.
--- drivers/net/ice/base/README | 4 ++-- drivers/net/ice/base/ice_acl.c | 2 +- drivers/net/ice/base/ice_acl.h | 2 +- drivers/net/ice/base/ice_acl_ctrl.c | 2 +- drivers/net/ice/base/ice_adminq_cmd.h | 2 +- drivers/net/ice/base/ice_alloc.h | 2 +- drivers/net/ice/base/ice_bitops.h | 2 +- drivers/net/ice/base/ice_common.c | 2 +- drivers/net/ice/base/ice_common.h | 2 +- drivers/net/ice/base/ice_controlq.c | 2 +- drivers/net/ice/base/ice_controlq.h | 2 +- drivers/net/ice/base/ice_dcb.c | 2 +- drivers/net/ice/base/ice_dcb.h | 2 +- drivers/net/ice/base/ice_devids.h | 2 +- drivers/net/ice/base/ice_fdir.c | 2 +- drivers/net/ice/base/ice_fdir.h | 2 +- drivers/net/ice/base/ice_flex_pipe.c | 2 +- drivers/net/ice/base/ice_flex_pipe.h | 2 +- drivers/net/ice/base/ice_flex_type.h | 2 +- drivers/net/ice/base/ice_flow.c | 2 +- drivers/net/ice/base/ice_flow.h | 2 +- drivers/net/ice/base/ice_hw_autogen.h | 2 +- drivers/net/ice/base/ice_lan_tx_rx.h | 2 +- drivers/net/ice/base/ice_nvm.c | 2 +- drivers/net/ice/base/ice_nvm.h | 2 +- drivers/net/ice/base/ice_osdep.h | 2 +- drivers/net/ice/base/ice_protocol_type.h | 2 +- drivers/net/ice/base/ice_sbq_cmd.h | 2 +- drivers/net/ice/base/ice_sched.c | 2 +- drivers/net/ice/base/ice_sched.h | 2 +- drivers/net/ice/base/ice_status.h | 2 +- drivers/net/ice/base/ice_switch.c | 2 +- drivers/net/ice/base/ice_switch.h | 2 +- drivers/net/ice/base/ice_type.h | 2 +- drivers/net/ice/base/ice_vlan_mode.c | 2 +- drivers/net/ice/base/ice_vlan_mode.h | 2 +- drivers/net/ice/base/meson.build | 2 +- 37 files changed, 38 insertions(+), 38 deletions(-)
drivers/net/ice/base/README +2 -2
@@ -1,12 +1,12 @@ /* SPDX-License-Identifier: BSD-3-Clause - * Copyright(c) 2020 Intel Corporation + * Copyright(c) 2020-2021 Intel Corporation */ Intel® ICE driver ================== This directory contains source code of FreeBSD ice driver of version -2020.10.21 released by the team which develops +2021.01.07 released by the team which develops basic drivers for any ice NIC. The directory of base/ contains the original source package. This driver is valid for the product(s) listed below
drivers/net/ice/base/ice_acl.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_acl.h"
drivers/net/ice/base/ice_acl.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_ACL_H_
drivers/net/ice/base/ice_acl_ctrl.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_acl.h"
drivers/net/ice/base/ice_adminq_cmd.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_ADMINQ_CMD_H_
drivers/net/ice/base/ice_alloc.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_ALLOC_H_
drivers/net/ice/base/ice_bitops.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_BITOPS_H_
drivers/net/ice/base/ice_common.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_common.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_COMMON_H_
drivers/net/ice/base/ice_controlq.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_controlq.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_CONTROLQ_H_
drivers/net/ice/base/ice_dcb.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_dcb.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_DCB_H_
drivers/net/ice/base/ice_devids.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_DEVIDS_H_
drivers/net/ice/base/ice_fdir.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_fdir.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_FDIR_H_
drivers/net/ice/base/ice_flex_pipe.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_flex_pipe.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_FLEX_PIPE_H_
drivers/net/ice/base/ice_flex_type.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_FLEX_TYPE_H_
drivers/net/ice/base/ice_flow.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_flow.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_FLOW_H_
drivers/net/ice/base/ice_hw_autogen.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ /* Machine-generated file; do not edit */
drivers/net/ice/base/ice_lan_tx_rx.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_LAN_TX_RX_H_
drivers/net/ice/base/ice_nvm.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_common.h"
drivers/net/ice/base/ice_nvm.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_NVM_H_
drivers/net/ice/base/ice_osdep.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2018-2020 Intel Corporation +* Copyright(c) 2018-2021 Intel Corporation */ #ifndef _ICE_OSDEP_H_
drivers/net/ice/base/ice_protocol_type.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_PROTOCOL_TYPE_H_
drivers/net/ice/base/ice_sbq_cmd.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_SBQ_CMD_H_
drivers/net/ice/base/ice_sched.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_sched.h"
drivers/net/ice/base/ice_sched.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_SCHED_H_
drivers/net/ice/base/ice_status.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_STATUS_H_
drivers/net/ice/base/ice_switch.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_switch.h"
drivers/net/ice/base/ice_switch.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_SWITCH_H_
drivers/net/ice/base/ice_type.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_TYPE_H_
drivers/net/ice/base/ice_vlan_mode.c +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #include "ice_vlan_mode.h"
drivers/net/ice/base/ice_vlan_mode.h +1 -1
@@ -1,5 +1,5 @@/* SPDX-License-Identifier: BSD-3-Clause -* Copyright(c) 2001-2020 Intel Corporation +* Copyright(c) 2001-2021 Intel Corporation */ #ifndef _ICE_VLAN_MODE_H_
drivers/net/ice/base/meson.build +1 -1
@@ -1,5 +1,5 @@ # SPDX-License-Identifier: BSD-3-Clause -# Copyright(c) 2018-2020 Intel Corporation +# Copyright(c) 2018-2021 Intel Corporation sources = [ 'ice_controlq.c',
Signature · 1 line
2.26.2
Quoted 70 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: 2021年1月8日 12:35
To: Yang, Qiming <[email protected]>
Cc: Wang, Haiyue <[email protected]>; Guo, Jia <[email protected]>; [email protected]; Yigit, Ferruh <[email protected]>; Zhang, Qi Z <[email protected]>
Subject: [PATCH 0/9] ice base update batch 2Summary:
1. Add GTPU inner support for FDIR.
2. refine the VSI AQ command.
3. Add PTYPE metadata learning.
4. couple bug fix and code clean
5. update the Copyright dateQi Zhang (9):
net/ice/base: align add VSI and update VSI AQ command buffernet/ice/base: remove the deprecated fieldnet/ice/base: add package PTYPE enable informationnet/ice/base: fix for memory handlingnet/ice/base: limit forced overrides based on FW versionnet/ice/base: support GTPU inner for AVF FDIRnet/ice/base: cleanup style issues
net/ice/base: updated the add scheduler node counternet/ice/base: update Copyright datedrivers/net/ice/base/README | 4 +- drivers/net/ice/base/ice_acl.c | 2 +- drivers/net/ice/base/ice_acl.h | 2 +- drivers/net/ice/base/ice_acl_ctrl.c | 2 +- drivers/net/ice/base/ice_adminq_cmd.h | 211 +++++++------- drivers/net/ice/base/ice_alloc.h | 2 +- drivers/net/ice/base/ice_bitops.h | 2 +- drivers/net/ice/base/ice_common.c | 16 +- drivers/net/ice/base/ice_common.h | 2 +- drivers/net/ice/base/ice_controlq.c | 2 +- drivers/net/ice/base/ice_controlq.h | 6 +- drivers/net/ice/base/ice_dcb.c | 2 +- drivers/net/ice/base/ice_dcb.h | 2 +- drivers/net/ice/base/ice_devids.h | 2 +- drivers/net/ice/base/ice_fdir.c | 357 +++++++++++++++++++++-- drivers/net/ice/base/ice_fdir.h | 2 +- drivers/net/ice/base/ice_flex_pipe.c | 81 ++++- drivers/net/ice/base/ice_flex_pipe.h | 5 +- drivers/net/ice/base/ice_flex_type.h | 25 +- drivers/net/ice/base/ice_flow.c | 8 +- drivers/net/ice/base/ice_flow.h | 2 +- drivers/net/ice/base/ice_hw_autogen.h | 2 +- drivers/net/ice/base/ice_lan_tx_rx.h | 2 +- drivers/net/ice/base/ice_nvm.c | 2 +- drivers/net/ice/base/ice_nvm.h | 2 +- drivers/net/ice/base/ice_osdep.h | 2 +- drivers/net/ice/base/ice_protocol_type.h | 2 +- drivers/net/ice/base/ice_sbq_cmd.h | 2 +- drivers/net/ice/base/ice_sched.c | 18 +- drivers/net/ice/base/ice_sched.h | 2 +- drivers/net/ice/base/ice_status.h | 2 +- drivers/net/ice/base/ice_switch.c | 2 +- drivers/net/ice/base/ice_switch.h | 3 +- drivers/net/ice/base/ice_type.h | 21 +- drivers/net/ice/base/ice_vlan_mode.c | 2 +- drivers/net/ice/base/ice_vlan_mode.h | 2 +- drivers/net/ice/base/meson.build | 2 +- drivers/net/ice/ice_ethdev.c | 88 +++--- 38 files changed, 655 insertions(+), 238 deletions(-)--
2.26.2
Zhang, Qi Z
AppliedQuoted 10 lines
-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Friday, January 8, 2021 2:05 PM
To: Zhang, Qi Z <[email protected]>
Cc: Wang, Haiyue <[email protected]>; Guo, Jia <[email protected]>; [email protected]; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH 0/9] ice base update batch 2
Quoted 73 lines
Acked-by Qiming Yang <[email protected]>Quoted 70 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: 2021年1月8日 12:35
To: Yang, Qiming <[email protected]>
Cc: Wang, Haiyue <[email protected]>; Guo, Jia <[email protected]>; [email protected]; Yigit, Ferruh <[email protected]>; Zhang, Qi Z <[email protected]>
Subject: [PATCH 0/9] ice base update batch 2Summary:
1. Add GTPU inner support for FDIR.
2. refine the VSI AQ command.
3. Add PTYPE metadata learning.
4. couple bug fix and code clean
5. update the Copyright dateQi Zhang (9):
net/ice/base: align add VSI and update VSI AQ command buffernet/ice/base: remove the deprecated fieldnet/ice/base: add package PTYPE enable informationnet/ice/base: fix for memory handlingnet/ice/base: limit forced overrides based on FW versionnet/ice/base: support GTPU inner for AVF FDIRnet/ice/base: cleanup style issues
net/ice/base: updated the add scheduler node counternet/ice/base: update Copyright datedrivers/net/ice/base/README | 4 +- drivers/net/ice/base/ice_acl.c | 2 +- drivers/net/ice/base/ice_acl.h | 2 +- drivers/net/ice/base/ice_acl_ctrl.c | 2 +- drivers/net/ice/base/ice_adminq_cmd.h | 211 +++++++------- drivers/net/ice/base/ice_alloc.h | 2 +- drivers/net/ice/base/ice_bitops.h | 2 +- drivers/net/ice/base/ice_common.c | 16 +- drivers/net/ice/base/ice_common.h | 2 +- drivers/net/ice/base/ice_controlq.c | 2 +- drivers/net/ice/base/ice_controlq.h | 6 +- drivers/net/ice/base/ice_dcb.c | 2 +- drivers/net/ice/base/ice_dcb.h | 2 +- drivers/net/ice/base/ice_devids.h | 2 +- drivers/net/ice/base/ice_fdir.c | 357 +++++++++++++++++++++-- drivers/net/ice/base/ice_fdir.h | 2 +- drivers/net/ice/base/ice_flex_pipe.c | 81 ++++- drivers/net/ice/base/ice_flex_pipe.h | 5 +- drivers/net/ice/base/ice_flex_type.h | 25 +- drivers/net/ice/base/ice_flow.c | 8 +- drivers/net/ice/base/ice_flow.h | 2 +- drivers/net/ice/base/ice_hw_autogen.h | 2 +- drivers/net/ice/base/ice_lan_tx_rx.h | 2 +- drivers/net/ice/base/ice_nvm.c | 2 +- drivers/net/ice/base/ice_nvm.h | 2 +- drivers/net/ice/base/ice_osdep.h | 2 +- drivers/net/ice/base/ice_protocol_type.h | 2 +- drivers/net/ice/base/ice_sbq_cmd.h | 2 +- drivers/net/ice/base/ice_sched.c | 18 +- drivers/net/ice/base/ice_sched.h | 2 +- drivers/net/ice/base/ice_status.h | 2 +- drivers/net/ice/base/ice_switch.c | 2 +- drivers/net/ice/base/ice_switch.h | 3 +- drivers/net/ice/base/ice_type.h | 21 +- drivers/net/ice/base/ice_vlan_mode.c | 2 +- drivers/net/ice/base/ice_vlan_mode.h | 2 +- drivers/net/ice/base/meson.build | 2 +- drivers/net/ice/ice_ethdev.c | 88 +++--- 38 files changed, 655 insertions(+), 238 deletions(-)--
2.26.2
Applied to dpdk-next-net-intel.
Thanks
Qi
Quoted 39 lines · Qi Z
Quoted 39 lines
-----Original Message-----
From: Yang, Qiming <[email protected]>
Sent: Friday, January 8, 2021 2:05 PM
To: Zhang, Qi Z <[email protected]>
Cc: Wang, Haiyue <[email protected]>; Guo, Jia <[email protected]>; [email protected]; Yigit, Ferruh <[email protected]>
Subject: RE: [PATCH 0/9] ice base update batch 2Acked-by Qiming Yang <[email protected]>Quoted 27 lines
-----Original Message-----
From: Zhang, Qi Z <[email protected]>
Sent: 2021年1月8日 12:35
To: Yang, Qiming <[email protected]>
Cc: Wang, Haiyue <[email protected]>; Guo, Jia <[email protected]>; [email protected]; Yigit, Ferruh <[email protected]>; Zhang, Qi Z <[email protected]>
Subject: [PATCH 0/9] ice base update batch 2Summary:
1. Add GTPU inner support for FDIR.
2. refine the VSI AQ command.
3. Add PTYPE metadata learning.
4. couple bug fix and code clean
5. update the Copyright dateQi Zhang (9):
net/ice/base: align add VSI and update VSI AQ command buffernet/ice/base: remove the deprecated fieldnet/ice/base: add package PTYPE enable informationnet/ice/base: fix for memory handlingnet/ice/base: limit forced overrides based on FW versionnet/ice/base: support GTPU inner for AVF FDIRnet/ice/base: cleanup style issues
net/ice/base: updated the add scheduler node counternet/ice/base: update Copyright date
<...>
Quoted 7 lines
Quoted 4 lines
Quoted 3 lines
--
2.26.2Applied to dpdk-next-net-intel.
Can you please send the release notes update for it?