net/ice: remove RSS for SCTP in PPPoE

[dpdk.git] / drivers / net / ice / ice_hash.c

diff --git a/drivers/net/ice/ice_hash.c b/drivers/net/ice/ice_hash.c
index 05388b4..2845ca0 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -204,10 +204,6 @@ 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_pppoes_ipv4_sctp = {
-       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV4 |
-       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
-       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV4_SCTP};
 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,
@@ -313,10 +309,6 @@ 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_ipv6_sctp = {
-       ICE_FLOW_SEG_HDR_PPPOE | ICE_FLOW_SEG_HDR_IPV6 |
-       ICE_FLOW_SEG_HDR_IPV_OTHER | ICE_FLOW_SEG_HDR_SCTP,
-       ETH_RSS_ETH | ETH_RSS_PPPOE | ETH_RSS_NONFRAG_IPV6_SCTP};
 struct rss_type_match_hdr hint_eth_pppoes = {
        ICE_FLOW_SEG_HDR_PPPOE,
        ETH_RSS_ETH | ETH_RSS_PPPOE};
@@ -400,8 +392,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &hint_eth_pppoes_ipv4_udp},
        {pattern_eth_pppoes_ipv4_tcp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv4_tcp},
-       {pattern_eth_pppoes_ipv4_sctp,      ICE_INSET_NONE,
-               &hint_eth_pppoes_ipv4_sctp},
        {pattern_eth_ipv4_esp,              ICE_INSET_NONE,
                &hint_eth_ipv4_esp},
        {pattern_eth_ipv4_udp_esp,          ICE_INSET_NONE,
@@ -452,8 +442,6 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
                &hint_eth_pppoes_ipv6_udp},
        {pattern_eth_pppoes_ipv6_tcp,       ICE_INSET_NONE,
                &hint_eth_pppoes_ipv6_tcp},
-       {pattern_eth_pppoes_ipv6_sctp,      ICE_INSET_NONE,
-               &hint_eth_pppoes_ipv6_sctp},
        {pattern_eth_pppoes,                ICE_INSET_NONE,
                &hint_eth_pppoes},
 };
@@ -506,6 +494,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -516,6 +505,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -535,6 +525,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -545,6 +536,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -564,6 +556,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -574,6 +567,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -614,6 +608,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -624,6 +619,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -643,6 +639,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -651,6 +648,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -664,6 +662,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -672,6 +671,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -685,6 +685,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -693,6 +694,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -708,6 +710,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -718,6 +721,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -735,6 +739,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -743,6 +748,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -756,6 +762,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -764,6 +771,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -777,6 +785,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -785,6 +794,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -800,6 +810,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -810,6 +821,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -827,6 +839,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -835,6 +848,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -848,6 +862,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -856,6 +871,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -869,6 +885,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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) |
@@ -877,6 +894,7 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -996,6 +1014,7 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
        const struct rte_flow_action *action;
        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;
@@ -1059,6 +1078,15 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                                          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. */
@@ -1073,7 +1101,8 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                         */
                        if (rss->func ==
                                RTE_ETH_HASH_FUNCTION_SYMMETRIC_TOEPLITZ) {
-                               if (rss_type & rss_attr_src_dst)
+                               if (rss_type & (rss_attr_src_dst |
+                                               ~rss_attr_symm))
                                        return rte_flow_error_set(error,
                                                ENOTSUP,
                                                RTE_FLOW_ERROR_TYPE_ACTION,