net/ice: fix GTPU down/uplink and extension conflict
[dpdk.git] / drivers / net / ice / ice_hash.c
index 11435cb..c0271df 100644 (file)
@@ -25,6 +25,9 @@
 #include "ice_ethdev.h"
 #include "ice_generic_flow.h"
 
+#define ICE_GTPU_EH_DWNLINK    0
+#define ICE_GTPU_EH_UPLINK     1
+
 struct rss_type_match_hdr {
        uint32_t hdr_mask;
        uint64_t eth_rss_hint;
@@ -76,70 +79,371 @@ ice_hash_parse_pattern_action(struct ice_adapter *ad,
                        struct rte_flow_error *error);
 
 /* The first member is protocol header, the second member is ETH_RSS_*. */
-struct rss_type_match_hdr hint_0 = {
+struct rss_type_match_hdr hint_empty = {
        ICE_FLOW_SEG_HDR_NONE,  0};
-struct rss_type_match_hdr hint_1 = {
-       ICE_FLOW_SEG_HDR_IPV4,  ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_2 = {
-       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_UDP, ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_3 = {
-       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_TCP, ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_4 = {
-       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_SCTP, ETH_RSS_NONFRAG_IPV4_SCTP};
-struct rss_type_match_hdr hint_5 = {
-       ICE_FLOW_SEG_HDR_IPV6,  ETH_RSS_IPV6};
-struct rss_type_match_hdr hint_6 = {
-       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_UDP, ETH_RSS_NONFRAG_IPV6_UDP};
-struct rss_type_match_hdr hint_7 = {
-       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_TCP, ETH_RSS_NONFRAG_IPV6_TCP};
-struct rss_type_match_hdr hint_8 = {
-       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_SCTP, ETH_RSS_NONFRAG_IPV6_SCTP};
-struct rss_type_match_hdr hint_9 = {
-       ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_10 = {
-       ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_IPV4};
-struct rss_type_match_hdr hint_11 = {
-       ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_12 = {
-       ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_TCP};
-struct rss_type_match_hdr hint_13 = {
-       ICE_FLOW_SEG_HDR_PPPOE, ETH_RSS_NONFRAG_IPV4_SCTP};
-struct rss_type_match_hdr hint_14 = {
-       ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_UDP};
-struct rss_type_match_hdr hint_15 = {
-       ICE_FLOW_SEG_HDR_GTPU_EH, ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4 = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_sctp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_SCTP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_SCTP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_IP | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv4_gtpu_eh_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6 = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_GTPU | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_gtpu_eh_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_GTPU_EH | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_GTPU | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_pppoes_ipv4 = {
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV4};
+struct rss_type_match_hdr hint_eth_pppoes_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_pppoes_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_ipv4_esp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_ESP,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv4_udp_esp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_NAT_T_ESP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv4_ah = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_AH,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_AH};
+struct rss_type_match_hdr hint_eth_ipv4_l2tpv3 = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_L2TPV3,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_L2TPV3};
+struct rss_type_match_hdr hint_eth_ipv4_pfcp = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_PFCP_SESSION,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_PFCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv4 = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_IPV4 | ETH_RSS_C_VLAN};
+struct rss_type_match_hdr hint_eth_vlan_ipv4_udp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV4_UDP};
+struct rss_type_match_hdr hint_eth_vlan_ipv4_tcp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV4_TCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv4_sctp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV4 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV4_SCTP};
+struct rss_type_match_hdr hint_eth_ipv6 = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_ipv6_sctp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_SCTP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_SCTP};
+struct rss_type_match_hdr hint_eth_ipv6_esp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_ESP,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv6_udp_esp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_NAT_T_ESP,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_ESP};
+struct rss_type_match_hdr hint_eth_ipv6_ah = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_AH,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_AH};
+struct rss_type_match_hdr hint_eth_ipv6_l2tpv3 = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_L2TPV3,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_L2TPV3};
+struct rss_type_match_hdr hint_eth_ipv6_pfcp = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_PFCP_SESSION,
+       ETH_RSS_ETH | ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_PFCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv6 = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_IPV6 | ETH_RSS_C_VLAN};
+struct rss_type_match_hdr hint_eth_vlan_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_vlan_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_vlan_ipv6_sctp = {
+       ICE_FLOW_SEG_HDR_VLAN | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
+       ETH_RSS_ETH | ETH_RSS_C_VLAN |
+       ETH_RSS_NONFRAG_IPV6_SCTP};
+struct rss_type_match_hdr hint_eth_pppoes_ipv6 = {
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_IPV6};
+struct rss_type_match_hdr hint_eth_pppoes_ipv6_udp = {
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_UDP,
+       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_UDP};
+struct rss_type_match_hdr hint_eth_pppoes_ipv6_tcp = {
+       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
+       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_TCP,
+       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_TCP};
+struct rss_type_match_hdr hint_eth_pppoes = {
+       ICE_FLOW_SEG_HDR_PPPOE,
+       ETH_RSS_ETH | ETH_RSS_PPPOE};
 
 /* Supported pattern for os default package. */
 static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
-       {pattern_eth_ipv4,      ICE_INSET_NONE, &hint_1},
-       {pattern_eth_ipv4_udp,  ICE_INSET_NONE, &hint_2},
-       {pattern_eth_ipv4_tcp,  ICE_INSET_NONE, &hint_3},
-       {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_4},
-       {pattern_eth_ipv6,      ICE_INSET_NONE, &hint_5},
-       {pattern_eth_ipv6_udp,  ICE_INSET_NONE, &hint_6},
-       {pattern_eth_ipv6_tcp,  ICE_INSET_NONE, &hint_7},
-       {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_8},
-       {pattern_empty,         ICE_INSET_NONE, &hint_0},
+       {pattern_eth_ipv4,      ICE_INSET_NONE, &hint_eth_ipv4},
+       {pattern_eth_ipv4_udp,  ICE_INSET_NONE, &hint_eth_ipv4_udp},
+       {pattern_eth_ipv4_tcp,  ICE_INSET_NONE, &hint_eth_ipv4_tcp},
+       {pattern_eth_ipv4_sctp, ICE_INSET_NONE, &hint_eth_ipv4_sctp},
+       {pattern_eth_ipv6,      ICE_INSET_NONE, &hint_eth_ipv6},
+       {pattern_eth_ipv6_udp,  ICE_INSET_NONE, &hint_eth_ipv6_udp},
+       {pattern_eth_ipv6_tcp,  ICE_INSET_NONE, &hint_eth_ipv6_tcp},
+       {pattern_eth_ipv6_sctp, ICE_INSET_NONE, &hint_eth_ipv6_sctp},
+       {pattern_empty,         ICE_INSET_NONE, &hint_empty},
 };
 
 /* Supported pattern for comms package. */
 static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
-       {pattern_eth_ipv4,                  ICE_INSET_NONE,  &hint_1},
-       {pattern_eth_ipv4_udp,              ICE_INSET_NONE,  &hint_2},
-       {pattern_eth_ipv4_tcp,              ICE_INSET_NONE,  &hint_3},
-       {pattern_eth_ipv4_sctp,             ICE_INSET_NONE,  &hint_4},
-       {pattern_eth_ipv6,                  ICE_INSET_NONE,  &hint_5},
-       {pattern_eth_ipv6_udp,              ICE_INSET_NONE,  &hint_6},
-       {pattern_eth_ipv6_tcp,              ICE_INSET_NONE,  &hint_7},
-       {pattern_eth_ipv6_sctp,             ICE_INSET_NONE,  &hint_8},
-       {pattern_empty,                     ICE_INSET_NONE,  &hint_0},
-       {pattern_eth_ipv4_gtpu_eh_ipv4,     ICE_INSET_NONE,  &hint_9},
-       {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,  &hint_14},
-       {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,  &hint_15},
-       {pattern_eth_pppoes_ipv4,           ICE_INSET_NONE,  &hint_10},
-       {pattern_eth_pppoes_ipv4_udp,       ICE_INSET_NONE,  &hint_11},
-       {pattern_eth_pppoes_ipv4_tcp,       ICE_INSET_NONE,  &hint_12},
-       {pattern_eth_pppoes_ipv4_sctp,      ICE_INSET_NONE,  &hint_13},
+       {pattern_empty,                     ICE_INSET_NONE,
+               &hint_empty},
+       {pattern_eth_ipv4,                  ICE_INSET_NONE,
+               &hint_eth_ipv4},
+       {pattern_eth_ipv4_udp,              ICE_INSET_NONE,
+               &hint_eth_ipv4_udp},
+       {pattern_eth_ipv4_tcp,              ICE_INSET_NONE,
+               &hint_eth_ipv4_tcp},
+       {pattern_eth_ipv4_sctp,             ICE_INSET_NONE,
+               &hint_eth_ipv4_sctp},
+       {pattern_eth_ipv4_gtpu_ipv4,        ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv4},
+       {pattern_eth_ipv4_gtpu_ipv4_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv4_udp},
+       {pattern_eth_ipv4_gtpu_ipv4_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv4_tcp},
+       {pattern_eth_ipv4_gtpu_ipv6,        ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv6},
+       {pattern_eth_ipv4_gtpu_ipv6_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv6_udp},
+       {pattern_eth_ipv4_gtpu_ipv6_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_ipv6_tcp},
+       {pattern_eth_ipv6_gtpu_ipv4,        ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv4},
+       {pattern_eth_ipv6_gtpu_ipv4_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv4_udp},
+       {pattern_eth_ipv6_gtpu_ipv4_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv4_tcp},
+       {pattern_eth_ipv6_gtpu_ipv6,        ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv6},
+       {pattern_eth_ipv6_gtpu_ipv6_udp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv6_udp},
+       {pattern_eth_ipv6_gtpu_ipv6_tcp,    ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_ipv6_tcp},
+       {pattern_eth_ipv4_gtpu_eh_ipv4,     ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv4},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv4_udp},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv4_tcp},
+       {pattern_eth_ipv4_gtpu_eh_ipv6,     ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv6},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv6_udp},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv4_gtpu_eh_ipv6_tcp},
+       {pattern_eth_ipv6_gtpu_eh_ipv4,     ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv4},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_udp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv4_udp},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv4_tcp},
+       {pattern_eth_ipv6_gtpu_eh_ipv6,     ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv6},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_udp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv6_udp},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_tcp, ICE_INSET_NONE,
+               &hint_eth_ipv6_gtpu_eh_ipv6_tcp},
+       {pattern_eth_pppoes_ipv4,           ICE_INSET_NONE,
+               &hint_eth_pppoes_ipv4},
+       {pattern_eth_pppoes_ipv4_udp,       ICE_INSET_NONE,
+               &hint_eth_pppoes_ipv4_udp},
+       {pattern_eth_pppoes_ipv4_tcp,       ICE_INSET_NONE,
+               &hint_eth_pppoes_ipv4_tcp},
+       {pattern_eth_ipv4_esp,              ICE_INSET_NONE,
+               &hint_eth_ipv4_esp},
+       {pattern_eth_ipv4_udp_esp,          ICE_INSET_NONE,
+               &hint_eth_ipv4_udp_esp},
+       {pattern_eth_ipv4_ah,               ICE_INSET_NONE,
+               &hint_eth_ipv4_ah},
+       {pattern_eth_ipv4_l2tp,             ICE_INSET_NONE,
+               &hint_eth_ipv4_l2tpv3},
+       {pattern_eth_ipv4_pfcp,             ICE_INSET_NONE,
+               &hint_eth_ipv4_pfcp},
+       {pattern_eth_vlan_ipv4,             ICE_INSET_NONE,
+               &hint_eth_vlan_ipv4},
+       {pattern_eth_vlan_ipv4_udp,         ICE_INSET_NONE,
+               &hint_eth_vlan_ipv4_udp},
+       {pattern_eth_vlan_ipv4_tcp,         ICE_INSET_NONE,
+               &hint_eth_vlan_ipv4_tcp},
+       {pattern_eth_vlan_ipv4_sctp,        ICE_INSET_NONE,
+               &hint_eth_vlan_ipv4_sctp},
+       {pattern_eth_ipv6,                  ICE_INSET_NONE,
+               &hint_eth_ipv6},
+       {pattern_eth_ipv6_udp,              ICE_INSET_NONE,
+               &hint_eth_ipv6_udp},
+       {pattern_eth_ipv6_tcp,              ICE_INSET_NONE,
+               &hint_eth_ipv6_tcp},
+       {pattern_eth_ipv6_sctp,             ICE_INSET_NONE,
+               &hint_eth_ipv6_sctp},
+       {pattern_eth_ipv6_esp,              ICE_INSET_NONE,
+               &hint_eth_ipv6_esp},
+       {pattern_eth_ipv6_udp_esp,          ICE_INSET_NONE,
+               &hint_eth_ipv6_udp_esp},
+       {pattern_eth_ipv6_ah,               ICE_INSET_NONE,
+               &hint_eth_ipv6_ah},
+       {pattern_eth_ipv6_l2tp,             ICE_INSET_NONE,
+               &hint_eth_ipv6_l2tpv3},
+       {pattern_eth_ipv6_pfcp,             ICE_INSET_NONE,
+               &hint_eth_ipv6_pfcp},
+       {pattern_eth_vlan_ipv6,             ICE_INSET_NONE,
+               &hint_eth_vlan_ipv6},
+       {pattern_eth_vlan_ipv6_udp,         ICE_INSET_NONE,
+               &hint_eth_vlan_ipv6_udp},
+       {pattern_eth_vlan_ipv6_tcp,         ICE_INSET_NONE,
+               &hint_eth_vlan_ipv6_tcp},
+       {pattern_eth_vlan_ipv6_sctp,        ICE_INSET_NONE,
+               &hint_eth_vlan_ipv6_sctp},
+       {pattern_eth_pppoes_ipv6,           ICE_INSET_NONE,
+               &hint_eth_pppoes_ipv6},
+       {pattern_eth_pppoes_ipv6_udp,       ICE_INSET_NONE,
+               &hint_eth_pppoes_ipv6_udp},
+       {pattern_eth_pppoes_ipv6_tcp,       ICE_INSET_NONE,
+               &hint_eth_pppoes_ipv6_tcp},
+       {pattern_eth_pppoes,                ICE_INSET_NONE,
+               &hint_eth_pppoes},
 };
 
 /**
@@ -147,66 +451,458 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
  * the second member is hash fields.
  */
 struct ice_hash_match_type ice_hash_type_list[] = {
-       {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,                                    BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
-       {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,                                    BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
-       {ETH_RSS_IPV4,                                                          ICE_FLOW_HASH_IPV4},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_UDP,                                              ICE_HASH_UDP_IPV4},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_TCP,                                              ICE_HASH_TCP_IPV4},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV4_SCTP,                                             ICE_HASH_SCTP_IPV4},
-       {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,                                    BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
-       {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,                                    BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
-       {ETH_RSS_IPV6,                                                          ICE_FLOW_HASH_IPV6},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_UDP,                                              ICE_HASH_UDP_IPV6},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,  BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,                        BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_TCP,                                              ICE_HASH_TCP_IPV6},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY, BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) | BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,                       BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
-       {ETH_RSS_NONFRAG_IPV6_SCTP,                                             ICE_HASH_SCTP_IPV6},
+       {ETH_RSS_L2_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},
+       {ETH_RSS_L2_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)},
+       {ETH_RSS_ETH | ETH_RSS_L2_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},
+       {ETH_RSS_ETH | ETH_RSS_L2_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)},
+       {ETH_RSS_ETH,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_DA)},
+       {ETH_RSS_PPPOE,
+               ICE_FLOW_HASH_PPPOE_SESS_ID},
+       {ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_L2_SRC_ONLY,
+               ICE_FLOW_HASH_PPPOE_SESS_ID |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ETH_SA)},
+       {ETH_RSS_C_VLAN,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_C_VLAN)},
+       {ETH_RSS_S_VLAN,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_S_VLAN)},
+       {ETH_RSS_ESP,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI)},
+       {ETH_RSS_AH,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_AH_SPI)},
+       {ETH_RSS_L2TPV3,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_L2TPV3_SESS_ID)},
+       {ETH_RSS_PFCP,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)},
+       {ETH_RSS_GTPU,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID)},
+       /* IPV4 */
+       {ETH_RSS_IPV4 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
+       {ETH_RSS_IPV4 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
+       {ETH_RSS_IPV4, ICE_FLOW_HASH_IPV4},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_UDP,
+               ICE_HASH_UDP_IPV4 |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_TCP,
+               ICE_HASH_TCP_IPV4 |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_SA)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_DA)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       {ETH_RSS_NONFRAG_IPV4_SCTP,
+               ICE_HASH_SCTP_IPV4 |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)},
+       /* IPV6 */
+       {ETH_RSS_IPV6 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
+       {ETH_RSS_IPV6 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
+       {ETH_RSS_IPV6, ICE_FLOW_HASH_IPV6},
+       {ETH_RSS_IPV6_PRE32 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32, ICE_FLOW_HASH_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48, ICE_FLOW_HASH_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64 | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64 | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64, ICE_FLOW_HASH_IPV6_PRE64},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_NONFRAG_IPV6_UDP | ETH_RSS_PFCP,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_PFCP_SEID)},
+       {ETH_RSS_NONFRAG_IPV6_UDP,
+               ICE_HASH_UDP_IPV6 |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_UDP, ICE_HASH_UDP_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_UDP, ICE_HASH_UDP_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_UDP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_UDP, ICE_HASH_UDP_IPV6_PRE64},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_NONFRAG_IPV6_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_NONFRAG_IPV6_TCP,
+               ICE_HASH_TCP_IPV6 |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_TCP, ICE_HASH_TCP_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_TCP, ICE_HASH_TCP_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_TCP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_TCP, ICE_HASH_TCP_IPV6_PRE64},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_SA)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_DA)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_NONFRAG_IPV6_SCTP,
+               ICE_HASH_SCTP_IPV6 |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_SA)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE32_DA)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE32_SCTP, ICE_HASH_SCTP_IPV6_PRE32},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_SA)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE48_DA)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE48_SCTP, ICE_HASH_SCTP_IPV6_PRE48},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_SA)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L3_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT) |
+               BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PRE64_DA)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L4_SRC_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_SRC_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP | ETH_RSS_L4_DST_ONLY,
+               BIT_ULL(ICE_FLOW_FIELD_IDX_SCTP_DST_PORT)},
+       {ETH_RSS_IPV6_PRE64_SCTP, ICE_HASH_SCTP_IPV6_PRE64},
 };
 
 static struct ice_flow_engine ice_hash_engine = {
@@ -261,10 +957,15 @@ ice_hash_init(struct ice_adapter *ad)
 }
 
 static int
-ice_hash_check_inset(const struct rte_flow_item pattern[],
-               struct rte_flow_error *error)
+ice_hash_parse_pattern(struct ice_pattern_match_item *pattern_match_item,
+                      const struct rte_flow_item pattern[], void **meta,
+                      struct rte_flow_error *error)
 {
+       uint32_t hdr_mask = ((struct rss_type_match_hdr *)
+               (pattern_match_item->meta))->hdr_mask;
        const struct rte_flow_item *item = pattern;
+       const struct rte_flow_item_gtp_psc *psc;
+       uint32_t hdrs = 0;
 
        for (item = pattern; item->type != RTE_FLOW_ITEM_TYPE_END; item++) {
                if (item->last) {
@@ -274,15 +975,29 @@ ice_hash_check_inset(const struct rte_flow_item pattern[],
                        return -rte_errno;
                }
 
-               /* Ignore spec and mask. */
-               if (item->spec || item->mask) {
-                       rte_flow_error_set(error, EINVAL,
-                                       RTE_FLOW_ERROR_TYPE_ITEM, item,
-                                       "Invalid spec/mask.");
-                       return -rte_errno;
+               switch (item->type) {
+               case RTE_FLOW_ITEM_TYPE_GTPU:
+                       hdrs |= ICE_FLOW_SEG_HDR_GTPU_IP;
+                       break;
+               case RTE_FLOW_ITEM_TYPE_GTP_PSC:
+                       psc = item->spec;
+                       hdr_mask &= ~ICE_FLOW_SEG_HDR_GTPU_EH;
+                       hdrs &= ~ICE_FLOW_SEG_HDR_GTPU_IP;
+                       if (!psc)
+                               hdrs |= ICE_FLOW_SEG_HDR_GTPU_EH;
+                       else if (psc->pdu_type == ICE_GTPU_EH_UPLINK)
+                               hdrs |= ICE_FLOW_SEG_HDR_GTPU_UP;
+                       else if (psc->pdu_type == ICE_GTPU_EH_DWNLINK)
+                               hdrs |= ICE_FLOW_SEG_HDR_GTPU_DWN;
+                       break;
+               default:
+                       break;
                }
        }
 
+       /* Save protocol header to rss_meta. */
+       ((struct rss_meta *)*meta)->pkt_hdr |= hdr_mask | hdrs;
+
        return 0;
 }
 
@@ -292,14 +1007,19 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                void **meta,
                struct rte_flow_error *error)
 {
-       const struct rte_flow_action *action;
-       enum rte_flow_action_type action_type;
-       const struct rte_flow_action_rss *rss;
        struct rss_type_match_hdr *m = (struct rss_type_match_hdr *)
                                (pattern_match_item->meta);
+       struct rss_meta *hash_meta = (struct rss_meta *)*meta;
        uint32_t type_list_len = RTE_DIM(ice_hash_type_list);
-       struct ice_hash_match_type *type_match_item;
-       uint64_t rss_hf;
+       enum rte_flow_action_type action_type;
+       const struct rte_flow_action_rss *rss;
+       const struct rte_flow_action *action;
+       bool hash_map_found = false;
+       uint64_t rss_attr_src_dst;
+       uint64_t rss_attr_l3_pre;
+       uint64_t rss_attr_symm;
+       uint64_t rss_attr_all;
+       uint64_t rss_type;
        uint16_t i;
 
        /* Supported action is RSS. */
@@ -309,35 +1029,24 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                switch (action_type) {
                case RTE_FLOW_ACTION_TYPE_RSS:
                        rss = action->conf;
-                       rss_hf = rss->types;
-
-                       /**
-                        * Check simultaneous use of SRC_ONLY and DST_ONLY
-                        * of the same level.
-                        */
-                       rss_hf = rte_eth_rss_hf_refine(rss_hf);
+                       rss_type = rss->types;
 
-                       /* Check if pattern is empty. */
+                       /* Check hash function and save it to rss_meta. */
                        if (pattern_match_item->pattern_list !=
-                               pattern_empty && rss->func ==
-                               RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)
+                           pattern_empty && rss->func ==
+                           RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {
                                return rte_flow_error_set(error, ENOTSUP,
                                        RTE_FLOW_ERROR_TYPE_ACTION, action,
                                        "Not supported flow");
-
-                       /* Check if rss types match pattern. */
-                       if (rss->func != RTE_ETH_HASH_FUNCTION_SIMPLE_XOR) {
-                               if (((rss_hf & ETH_RSS_IPV4) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_NONFRAG_IPV4_UDP) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_NONFRAG_IPV4_TCP) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_NONFRAG_IPV4_SCTP) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_IPV6) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_NONFRAG_IPV6_UDP) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_NONFRAG_IPV6_TCP) != m->eth_rss_hint) &&
-                               ((rss_hf & ETH_RSS_NONFRAG_IPV6_SCTP) != m->eth_rss_hint))
-                                       return rte_flow_error_set(error,
-                                       ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
-                                       action, "Not supported RSS types");
+                       } else if (rss->func ==
+                                  RTE_ETH_HASH_FUNCTION_SIMPLE_XOR){
+                               ((struct rss_meta *)*meta)->hash_function =
+                               RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+                               return 0;
+                       } else if (rss->func ==
+                                  RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+                               ((struct rss_meta *)*meta)->hash_function =
+                               RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
                        }
 
                        if (rss->level)
@@ -355,42 +1064,112 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                                        RTE_FLOW_ERROR_TYPE_ACTION, action,
                                        "a non-NULL RSS queue is not supported");
 
-                       /* Check hash function and save it to rss_meta. */
-                       if (rss->func ==
-                               RTE_ETH_HASH_FUNCTION_SIMPLE_XOR)
-                               ((struct rss_meta *)*meta)->hash_function =
-                               RTE_ETH_HASH_FUNCTION_SIMPLE_XOR;
+                       /**
+                        * Check simultaneous use of SRC_ONLY and DST_ONLY
+                        * of the same level.
+                        */
+                       rss_type = rte_eth_rss_hf_refine(rss_type);
+
+                       rss_attr_src_dst = ETH_RSS_L2_SRC_ONLY |
+                                          ETH_RSS_L2_DST_ONLY |
+                                          ETH_RSS_L3_SRC_ONLY |
+                                          ETH_RSS_L3_DST_ONLY |
+                                          ETH_RSS_L4_SRC_ONLY |
+                                          ETH_RSS_L4_DST_ONLY;
+
+                       rss_attr_l3_pre = RTE_ETH_RSS_L3_PRE32 |
+                                         RTE_ETH_RSS_L3_PRE48 |
+                                         RTE_ETH_RSS_L3_PRE64;
+
+                       rss_attr_symm = ETH_RSS_IPV4 |
+                                       ETH_RSS_NONFRAG_IPV4_UDP |
+                                       ETH_RSS_NONFRAG_IPV4_TCP |
+                                       ETH_RSS_NONFRAG_IPV4_SCTP |
+                                       ETH_RSS_IPV6 |
+                                       ETH_RSS_NONFRAG_IPV6_UDP |
+                                       ETH_RSS_NONFRAG_IPV6_TCP |
+                                       ETH_RSS_NONFRAG_IPV6_SCTP;
+
+                       rss_attr_all = rss_attr_src_dst | rss_attr_l3_pre;
+
+                       /* Check if only SRC/DST_ONLY or ipv6 prefix exists. */
+                       if ((rss_type & ~rss_attr_all) == 0)
+                               return rte_flow_error_set(error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                       "invalid rss types");
 
+                       /**
+                        * Check if SRC/DST_ONLY is set for SYMMETRIC_TOEPLITZ
+                        * hash function.
+                        */
                        if (rss->func ==
-                               RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ)
-                               ((struct rss_meta *)*meta)->hash_function =
-                               RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ;
+                               RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
+                               if (rss_type & (rss_attr_src_dst |
+                                               ~rss_attr_symm))
+                                       return rte_flow_error_set(error,
+                                               ENOTSUP,
+                                               RTE_FLOW_ERROR_TYPE_ACTION,
+                                               action,
+                                               "invalid rss types");
+                       }
 
-                       type_match_item = rte_zmalloc("ice_type_match_item",
-                                       sizeof(struct ice_hash_match_type), 0);
-                       if (!type_match_item) {
-                               rte_flow_error_set(error, EINVAL,
-                                       RTE_FLOW_ERROR_TYPE_HANDLE, NULL,
-                                       "No memory for type_match_item");
-                               return -ENOMEM;
+                       /* Check if rss types match pattern. */
+                       if (rss_type & ~rss_attr_all & ~m->eth_rss_hint) {
+                               return rte_flow_error_set(error,
+                               ENOTSUP, RTE_FLOW_ERROR_TYPE_ACTION,
+                               action, "Not supported RSS types");
                        }
 
                        /* Find matched hash fields according to hash type. */
                        for (i = 0; i < type_list_len; i++) {
-                               if (rss_hf ==
-                                       ice_hash_type_list[i].hash_type) {
-                                       type_match_item->hash_type =
-                                               ice_hash_type_list[i].hash_type;
-                                       type_match_item->hash_flds =
-                                               ice_hash_type_list[i].hash_flds;
+                               struct ice_hash_match_type *ht_map =
+                                       &ice_hash_type_list[i];
+
+                               if (rss_type == ht_map->hash_type) {
+                                       hash_meta->hash_flds =
+                                                       ht_map->hash_flds;
+                                       hash_map_found = true;
+                                       break;
                                }
                        }
 
-                       /* Save hash fileds to rss_meta. */
-                       ((struct rss_meta *)*meta)->hash_flds =
-                                       type_match_item->hash_flds;
+                       if (pattern_match_item->pattern_list !=
+                           pattern_empty && !hash_map_found) {
+                               return rte_flow_error_set(error, ENOTSUP,
+                                       RTE_FLOW_ERROR_TYPE_ACTION, action,
+                                       "Not supported flow");
+                       }
+
+                       /* update hash field for nat-t esp. */
+                       if (rss_type == ETH_RSS_ESP &&
+                           (m->eth_rss_hint & ETH_RSS_NONFRAG_IPV4_UDP ||
+                            m->eth_rss_hint & ETH_RSS_NONFRAG_IPV6_UDP)) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_ESP_SPI));
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI);
+                       }
+
+                       /* update hash field for gtpu eh/gtpu dwn/gtpu up. */
+                       if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_EH_TEID);
+                       } else if (hash_meta->pkt_hdr &
+                                  ICE_FLOW_SEG_HDR_GTPU_DWN) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_DWN_TEID);
+                       } else if (hash_meta->pkt_hdr &
+                                  ICE_FLOW_SEG_HDR_GTPU_UP) {
+                               hash_meta->hash_flds &=
+                               ~(BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID));
+                               hash_meta->hash_flds |=
+                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_UP_TEID);
+                       }
 
-                       rte_free(type_match_item);
                        break;
 
                case RTE_FLOW_ACTION_TYPE_END:
@@ -436,14 +1215,11 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad,
                goto error;
        }
 
-       ret = ice_hash_check_inset(pattern, error);
+       ret = ice_hash_parse_pattern(pattern_match_item, pattern,
+                                    (void **)&rss_meta_ptr, error);
        if (ret)
                goto error;
 
-       /* Save protocol header to rss_meta. */
-       rss_meta_ptr->pkt_hdr = ((struct rss_type_match_hdr *)
-               (pattern_match_item->meta))->hdr_mask;
-
        /* Check rss action. */
        ret = ice_hash_parse_action(pattern_match_item, actions,
                                    (void **)&rss_meta_ptr, error);
@@ -501,7 +1277,7 @@ ice_hash_create(struct ice_adapter *ad,
                        (hash_function ==
                                RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ);
 
-               ret = ice_add_rss_cfg(hw, vsi->idx,
+               ret = ice_add_rss_cfg_wrap(pf, vsi->idx,
                                filter_ptr->rss_cfg.hashed_flds,
                                filter_ptr->rss_cfg.packet_hdr,
                                filter_ptr->rss_cfg.symm);
@@ -545,7 +1321,7 @@ ice_hash_destroy(struct ice_adapter *ad,
                        (1 << VSIQF_HASH_CTL_HASH_SCHEME_S);
                ICE_WRITE_REG(hw, VSIQF_HASH_CTL(vsi->vsi_id), reg);
        } else {
-               ret = ice_rem_rss_cfg(hw, vsi->idx,
+               ret = ice_rem_rss_cfg_wrap(pf, vsi->idx,
                                filter_ptr->rss_cfg.hashed_flds,
                                filter_ptr->rss_cfg.packet_hdr);
                /* Fixme: Ignore the error if a rule does not exist.