git.droids-corp.org / dpdk.git / blobdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | inline | side by side
net/ice/base: expose link configuration error
[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 c3ab4a0..81caf6c 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -12,7 +12,7 @@
 
 #include <rte_debug.h>
 #include <rte_ether.h>
-#include <rte_ethdev_driver.h>
+#include <ethdev_driver.h>
 #include <rte_log.h>
 #include <rte_malloc.h>
 #include <rte_eth_ctrl.h>
@@ -36,8 +36,8 @@
 #define ICE_GTPU_EH_DWNLINK    0
 #define ICE_GTPU_EH_UPLINK     1
 
-#define ICE_IPV4_PROT BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)
-#define ICE_IPV6_PROT BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)
+#define ICE_IPV4_PROT          BIT_ULL(ICE_FLOW_FIELD_IDX_IPV4_PROT)
+#define ICE_IPV6_PROT          BIT_ULL(ICE_FLOW_FIELD_IDX_IPV6_PROT)
 
 #define VALID_RSS_IPV4_L4      (ETH_RSS_NONFRAG_IPV4_UDP       | \
                                 ETH_RSS_NONFRAG_IPV4_TCP       | \
@@ -170,13 +170,13 @@ struct ice_rss_hash_cfg ipv6_sctp_tmplt = {
        0
 };
 
-struct ice_rss_hash_cfg eth_inner_ipv4_tmplt = {
+struct ice_rss_hash_cfg outer_ipv4_inner_ipv4_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
        ICE_FLOW_HASH_IPV4,
        ICE_RSS_INNER_HEADERS_W_OUTER_IPV4,
        0
 };
-struct ice_rss_hash_cfg eth_inner_ipv4_udp_tmplt = {
+struct ice_rss_hash_cfg outer_ipv4_inner_ipv4_udp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_UDP,
        ICE_HASH_UDP_IPV4 | ICE_IPV4_PROT,
@@ -184,7 +184,7 @@ struct ice_rss_hash_cfg eth_inner_ipv4_udp_tmplt = {
        0
 };
 
-struct ice_rss_hash_cfg eth_inner_ipv4_tcp_tmplt = {
+struct ice_rss_hash_cfg outer_ipv4_inner_ipv4_tcp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_TCP,
        ICE_HASH_TCP_IPV4 | ICE_IPV4_PROT,
@@ -192,13 +192,57 @@ struct ice_rss_hash_cfg eth_inner_ipv4_tcp_tmplt = {
        0
 };
 
-struct ice_rss_hash_cfg eth_inner_ipv6_tmplt = {
+struct ice_rss_hash_cfg outer_ipv6_inner_ipv4_tmplt = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ICE_FLOW_HASH_IPV4,
+       ICE_RSS_INNER_HEADERS_W_OUTER_IPV6,
+       0
+};
+struct ice_rss_hash_cfg outer_ipv6_inner_ipv4_udp_tmplt = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_UDP,
+       ICE_HASH_UDP_IPV4 | ICE_IPV4_PROT,
+       ICE_RSS_INNER_HEADERS_W_OUTER_IPV6,
+       0
+};
+
+struct ice_rss_hash_cfg outer_ipv6_inner_ipv4_tcp_tmplt = {
+       ICE_FLOW_SEG_HDR_IPV4 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_TCP,
+       ICE_HASH_TCP_IPV4 | ICE_IPV4_PROT,
+       ICE_RSS_INNER_HEADERS_W_OUTER_IPV6,
+       0
+};
+
+struct ice_rss_hash_cfg outer_ipv4_inner_ipv6_tmplt = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
+       ICE_FLOW_HASH_IPV6,
+       ICE_RSS_INNER_HEADERS_W_OUTER_IPV4,
+       0
+};
+struct ice_rss_hash_cfg outer_ipv4_inner_ipv6_udp_tmplt = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_UDP,
+       ICE_HASH_UDP_IPV6 | ICE_IPV6_PROT,
+       ICE_RSS_INNER_HEADERS_W_OUTER_IPV4,
+       0
+};
+
+struct ice_rss_hash_cfg outer_ipv4_inner_ipv6_tcp_tmplt = {
+       ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
+       ICE_FLOW_SEG_HDR_TCP,
+       ICE_HASH_TCP_IPV6 | ICE_IPV6_PROT,
+       ICE_RSS_INNER_HEADERS_W_OUTER_IPV4,
+       0
+};
+
+struct ice_rss_hash_cfg outer_ipv6_inner_ipv6_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER,
        ICE_FLOW_HASH_IPV6,
        ICE_RSS_INNER_HEADERS_W_OUTER_IPV6,
        0
 };
-struct ice_rss_hash_cfg eth_inner_ipv6_udp_tmplt = {
+struct ice_rss_hash_cfg outer_ipv6_inner_ipv6_udp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_UDP,
        ICE_HASH_UDP_IPV6 | ICE_IPV6_PROT,
@@ -206,7 +250,7 @@ struct ice_rss_hash_cfg eth_inner_ipv6_udp_tmplt = {
        0
 };
 
-struct ice_rss_hash_cfg eth_inner_ipv6_tcp_tmplt = {
+struct ice_rss_hash_cfg outer_ipv6_inner_ipv6_tcp_tmplt = {
        ICE_FLOW_SEG_HDR_IPV6 | ICE_FLOW_SEG_HDR_IPV_OTHER |
        ICE_FLOW_SEG_HDR_TCP,
        ICE_HASH_TCP_IPV6 | ICE_IPV6_PROT,
@@ -312,22 +356,22 @@ struct ice_rss_hash_cfg empty_tmplt = {
 /* Empty rss type to support simple_xor. */
 #define ICE_RSS_TYPE_EMPTY     0ULL
 
-/* IPv4 outer*/
+/* IPv4 outer */
 #define ICE_RSS_TYPE_OUTER_IPV4                (ETH_RSS_ETH | ETH_RSS_IPV4)
 #define ICE_RSS_TYPE_OUTER_IPV4_UDP    (ICE_RSS_TYPE_OUTER_IPV4 | \
-                                       ETH_RSS_NONFRAG_IPV4_UDP)
+                                        ETH_RSS_NONFRAG_IPV4_UDP)
 #define ICE_RSS_TYPE_OUTER_IPV4_TCP    (ICE_RSS_TYPE_OUTER_IPV4 | \
-                                       ETH_RSS_NONFRAG_IPV4_TCP)
+                                        ETH_RSS_NONFRAG_IPV4_TCP)
 #define ICE_RSS_TYPE_OUTER_IPV4_SCTP   (ICE_RSS_TYPE_OUTER_IPV4 | \
-                                       ETH_RSS_NONFRAG_IPV4_SCTP)
-/* IPv6 */
+                                        ETH_RSS_NONFRAG_IPV4_SCTP)
+/* IPv6 outer */
 #define ICE_RSS_TYPE_OUTER_IPV6                (ETH_RSS_ETH | ETH_RSS_IPV6)
 #define ICE_RSS_TYPE_OUTER_IPV6_UDP    (ICE_RSS_TYPE_OUTER_IPV6 | \
-                                       ETH_RSS_NONFRAG_IPV6_UDP)
+                                        ETH_RSS_NONFRAG_IPV6_UDP)
 #define ICE_RSS_TYPE_OUTER_IPV6_TCP    (ICE_RSS_TYPE_OUTER_IPV6 | \
-                                       ETH_RSS_NONFRAG_IPV6_TCP)
+                                        ETH_RSS_NONFRAG_IPV6_TCP)
 #define ICE_RSS_TYPE_OUTER_IPV6_SCTP   (ICE_RSS_TYPE_OUTER_IPV6 | \
-                                       ETH_RSS_NONFRAG_IPV6_SCTP)
+                                        ETH_RSS_NONFRAG_IPV6_SCTP)
 
 /* VLAN IPV4 */
 #define ICE_RSS_TYPE_VLAN_IPV4         (ICE_RSS_TYPE_OUTER_IPV4 | \
@@ -349,7 +393,7 @@ struct ice_rss_hash_cfg empty_tmplt = {
                                         ETH_RSS_S_VLAN | ETH_RSS_C_VLAN)
 
 /* IPv4 inner */
-#define ICE_RSS_TYPE_INNER_IPV4        ETH_RSS_IPV4
+#define ICE_RSS_TYPE_INNER_IPV4                ETH_RSS_IPV4
 #define ICE_RSS_TYPE_INNER_IPV4_UDP    (ETH_RSS_IPV4 | \
                                         ETH_RSS_NONFRAG_IPV4_UDP)
 #define ICE_RSS_TYPE_INNER_IPV4_TCP    (ETH_RSS_IPV4 | \
@@ -357,7 +401,7 @@ struct ice_rss_hash_cfg empty_tmplt = {
 #define ICE_RSS_TYPE_INNER_IPV4_SCTP   (ETH_RSS_IPV4 | \
                                         ETH_RSS_NONFRAG_IPV4_SCTP)
 /* IPv6 inner */
-#define ICE_RSS_TYPE_INNER_IPV6        ETH_RSS_IPV6
+#define ICE_RSS_TYPE_INNER_IPV6                ETH_RSS_IPV6
 #define ICE_RSS_TYPE_INNER_IPV6_UDP    (ETH_RSS_IPV6 | \
                                         ETH_RSS_NONFRAG_IPV6_UDP)
 #define ICE_RSS_TYPE_INNER_IPV6_TCP    (ETH_RSS_IPV6 | \
@@ -380,16 +424,34 @@ struct ice_rss_hash_cfg empty_tmplt = {
 #define ICE_RSS_TYPE_GTPU_IPV6_TCP     (ICE_RSS_TYPE_INNER_IPV6_TCP | \
                                         ETH_RSS_GTPU)
 
-/* ESP, AH, L2TPV3, PFCP and PPPOE */
+/* PPPOE */
+#define ICE_RSS_TYPE_PPPOE             (ETH_RSS_ETH | ETH_RSS_PPPOE)
+
+/* PPPOE IPv4 */
+#define ICE_RSS_TYPE_PPPOE_IPV4                (ICE_RSS_TYPE_INNER_IPV4 | \
+                                        ICE_RSS_TYPE_PPPOE)
+#define ICE_RSS_TYPE_PPPOE_IPV4_UDP    (ICE_RSS_TYPE_INNER_IPV4_UDP | \
+                                        ICE_RSS_TYPE_PPPOE)
+#define ICE_RSS_TYPE_PPPOE_IPV4_TCP    (ICE_RSS_TYPE_INNER_IPV4_TCP | \
+                                        ICE_RSS_TYPE_PPPOE)
+
+/* PPPOE IPv6 */
+#define ICE_RSS_TYPE_PPPOE_IPV6                (ICE_RSS_TYPE_INNER_IPV6 | \
+                                        ICE_RSS_TYPE_PPPOE)
+#define ICE_RSS_TYPE_PPPOE_IPV6_UDP    (ICE_RSS_TYPE_INNER_IPV6_UDP | \
+                                        ICE_RSS_TYPE_PPPOE)
+#define ICE_RSS_TYPE_PPPOE_IPV6_TCP    (ICE_RSS_TYPE_INNER_IPV6_TCP | \
+                                        ICE_RSS_TYPE_PPPOE)
+
+/* ESP, AH, L2TPV3 and PFCP */
 #define ICE_RSS_TYPE_IPV4_ESP          (ETH_RSS_ESP | ETH_RSS_IPV4)
-#define ICE_RSS_TYPE_IPV4_AH           (ETH_RSS_AH | ETH_RSS_IPV4)
 #define ICE_RSS_TYPE_IPV6_ESP          (ETH_RSS_ESP | ETH_RSS_IPV6)
+#define ICE_RSS_TYPE_IPV4_AH           (ETH_RSS_AH | ETH_RSS_IPV4)
 #define ICE_RSS_TYPE_IPV6_AH           (ETH_RSS_AH | ETH_RSS_IPV6)
 #define ICE_RSS_TYPE_IPV4_L2TPV3       (ETH_RSS_L2TPV3 | ETH_RSS_IPV4)
 #define ICE_RSS_TYPE_IPV6_L2TPV3       (ETH_RSS_L2TPV3 | ETH_RSS_IPV6)
 #define ICE_RSS_TYPE_IPV4_PFCP         (ETH_RSS_PFCP | ETH_RSS_IPV4)
 #define ICE_RSS_TYPE_IPV6_PFCP         (ETH_RSS_PFCP | ETH_RSS_IPV6)
-#define ICE_RSS_TYPE_PPPOE             (ETH_RSS_ETH | ETH_RSS_PPPOE)
 
 /**
  * Supported pattern for hash.
@@ -397,25 +459,7 @@ struct ice_rss_hash_cfg empty_tmplt = {
  * the second member is input set mask,
  * the third member is ice_rss_hash_cfg template.
  */
-
-/* Supported pattern for os default package. */
-static struct ice_pattern_match_item ice_hash_pattern_list_os[] = {
-       /* IPV4 */
-       {pattern_eth_ipv4,                      ICE_RSS_TYPE_OUTER_IPV4,        &ipv4_tmplt},
-       {pattern_eth_ipv4_udp,                  ICE_RSS_TYPE_OUTER_IPV4_UDP,    &ipv4_udp_tmplt},
-       {pattern_eth_ipv4_tcp,                  ICE_RSS_TYPE_OUTER_IPV4_TCP,    &ipv4_tcp_tmplt},
-       {pattern_eth_ipv4_sctp,                 ICE_RSS_TYPE_OUTER_IPV4_SCTP,   &ipv4_sctp_tmplt},
-       /* IPV6 */
-       {pattern_eth_ipv6,                      ICE_RSS_TYPE_OUTER_IPV6,        &ipv6_tmplt},
-       {pattern_eth_ipv6_udp,                  ICE_RSS_TYPE_OUTER_IPV6_UDP,    &ipv6_udp_tmplt},
-       {pattern_eth_ipv6_tcp,                  ICE_RSS_TYPE_OUTER_IPV6_TCP,    &ipv6_tcp_tmplt},
-       {pattern_eth_ipv6_sctp,                 ICE_RSS_TYPE_OUTER_IPV6_SCTP,   &ipv6_sctp_tmplt},
-       /* EMPTY */
-       {pattern_empty,                         ICE_RSS_TYPE_EMPTY,             &empty_tmplt},
-};
-
-/* Supported pattern for comms package. */
-static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
+static struct ice_pattern_match_item ice_hash_pattern_list[] = {
        /* IPV4 */
        {pattern_eth_ipv4,                      ICE_RSS_TYPE_OUTER_IPV4,        &ipv4_tmplt},
        {pattern_eth_ipv4_udp,                  ICE_RSS_TYPE_OUTER_IPV4_UDP,    &ipv4_udp_tmplt},
@@ -425,21 +469,21 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
        {pattern_eth_vlan_ipv4_udp,             ICE_RSS_TYPE_VLAN_IPV4_UDP,     &ipv4_udp_tmplt},
        {pattern_eth_vlan_ipv4_tcp,             ICE_RSS_TYPE_VLAN_IPV4_TCP,     &ipv4_tcp_tmplt},
        {pattern_eth_vlan_ipv4_sctp,            ICE_RSS_TYPE_VLAN_IPV4_SCTP,    &ipv4_sctp_tmplt},
-       {pattern_eth_ipv4_gtpu_ipv4,            ICE_RSS_TYPE_GTPU_IPV4,         &eth_inner_ipv4_tmplt},
-       {pattern_eth_ipv4_gtpu_ipv4_udp,        ICE_RSS_TYPE_GTPU_IPV4_UDP,     &eth_inner_ipv4_udp_tmplt},
-       {pattern_eth_ipv4_gtpu_ipv4_tcp,        ICE_RSS_TYPE_GTPU_IPV4_TCP,     &eth_inner_ipv4_tcp_tmplt},
-       {pattern_eth_ipv6_gtpu_ipv4,            ICE_RSS_TYPE_GTPU_IPV4,         &eth_inner_ipv4_tmplt},
-       {pattern_eth_ipv6_gtpu_ipv4_udp,        ICE_RSS_TYPE_GTPU_IPV4_UDP,     &eth_inner_ipv4_udp_tmplt},
-       {pattern_eth_ipv6_gtpu_ipv4_tcp,        ICE_RSS_TYPE_GTPU_IPV4_TCP,     &eth_inner_ipv4_tcp_tmplt},
-       {pattern_eth_ipv4_gtpu_eh_ipv4,         ICE_RSS_TYPE_GTPU_IPV4,         &eth_inner_ipv4_tmplt},
-       {pattern_eth_ipv4_gtpu_eh_ipv4_udp,     ICE_RSS_TYPE_GTPU_IPV4_UDP,     &eth_inner_ipv4_udp_tmplt},
-       {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,     ICE_RSS_TYPE_GTPU_IPV4_TCP,     &eth_inner_ipv4_tcp_tmplt},
-       {pattern_eth_ipv6_gtpu_eh_ipv4,         ICE_RSS_TYPE_GTPU_IPV4,         &eth_inner_ipv4_tmplt},
-       {pattern_eth_ipv6_gtpu_eh_ipv4_udp,     ICE_RSS_TYPE_GTPU_IPV4_UDP,     &eth_inner_ipv4_udp_tmplt},
-       {pattern_eth_ipv6_gtpu_eh_ipv4_tcp,     ICE_RSS_TYPE_GTPU_IPV4_TCP,     &eth_inner_ipv4_tcp_tmplt},
-       {pattern_eth_pppoes_ipv4,               ICE_RSS_TYPE_OUTER_IPV4,        &ipv4_tmplt},
-       {pattern_eth_pppoes_ipv4_udp,           ICE_RSS_TYPE_OUTER_IPV4_UDP,    &ipv4_udp_tmplt},
-       {pattern_eth_pppoes_ipv4_tcp,           ICE_RSS_TYPE_OUTER_IPV4_TCP,    &ipv4_tcp_tmplt},
+       {pattern_eth_ipv4_gtpu_ipv4,            ICE_RSS_TYPE_GTPU_IPV4,         &outer_ipv4_inner_ipv4_tmplt},
+       {pattern_eth_ipv4_gtpu_ipv4_udp,        ICE_RSS_TYPE_GTPU_IPV4_UDP,     &outer_ipv4_inner_ipv4_udp_tmplt},
+       {pattern_eth_ipv4_gtpu_ipv4_tcp,        ICE_RSS_TYPE_GTPU_IPV4_TCP,     &outer_ipv4_inner_ipv4_tcp_tmplt},
+       {pattern_eth_ipv6_gtpu_ipv4,            ICE_RSS_TYPE_GTPU_IPV4,         &outer_ipv6_inner_ipv4_tmplt},
+       {pattern_eth_ipv6_gtpu_ipv4_udp,        ICE_RSS_TYPE_GTPU_IPV4_UDP,     &outer_ipv6_inner_ipv4_udp_tmplt},
+       {pattern_eth_ipv6_gtpu_ipv4_tcp,        ICE_RSS_TYPE_GTPU_IPV4_TCP,     &outer_ipv6_inner_ipv4_tcp_tmplt},
+       {pattern_eth_ipv4_gtpu_eh_ipv4,         ICE_RSS_TYPE_GTPU_IPV4,         &outer_ipv4_inner_ipv4_tmplt},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_udp,     ICE_RSS_TYPE_GTPU_IPV4_UDP,     &outer_ipv4_inner_ipv4_udp_tmplt},
+       {pattern_eth_ipv4_gtpu_eh_ipv4_tcp,     ICE_RSS_TYPE_GTPU_IPV4_TCP,     &outer_ipv4_inner_ipv4_tcp_tmplt},
+       {pattern_eth_ipv6_gtpu_eh_ipv4,         ICE_RSS_TYPE_GTPU_IPV4,         &outer_ipv6_inner_ipv4_tmplt},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_udp,     ICE_RSS_TYPE_GTPU_IPV4_UDP,     &outer_ipv6_inner_ipv4_udp_tmplt},
+       {pattern_eth_ipv6_gtpu_eh_ipv4_tcp,     ICE_RSS_TYPE_GTPU_IPV4_TCP,     &outer_ipv6_inner_ipv4_tcp_tmplt},
+       {pattern_eth_pppoes_ipv4,               ICE_RSS_TYPE_PPPOE_IPV4,        &ipv4_tmplt},
+       {pattern_eth_pppoes_ipv4_udp,           ICE_RSS_TYPE_PPPOE_IPV4_UDP,    &ipv4_udp_tmplt},
+       {pattern_eth_pppoes_ipv4_tcp,           ICE_RSS_TYPE_PPPOE_IPV4_TCP,    &ipv4_tcp_tmplt},
        {pattern_eth_ipv4_esp,                  ICE_RSS_TYPE_IPV4_ESP,          &eth_ipv4_esp_tmplt},
        {pattern_eth_ipv4_udp_esp,              ICE_RSS_TYPE_IPV4_ESP,          &eth_ipv4_udp_esp_tmplt},
        {pattern_eth_ipv4_ah,                   ICE_RSS_TYPE_IPV4_AH,           &eth_ipv4_ah_tmplt},
@@ -454,21 +498,21 @@ static struct ice_pattern_match_item ice_hash_pattern_list_comms[] = {
        {pattern_eth_vlan_ipv6_udp,             ICE_RSS_TYPE_VLAN_IPV6_UDP,     &ipv6_udp_tmplt},
        {pattern_eth_vlan_ipv6_tcp,             ICE_RSS_TYPE_VLAN_IPV6_TCP,     &ipv6_tcp_tmplt},
        {pattern_eth_vlan_ipv6_sctp,            ICE_RSS_TYPE_VLAN_IPV6_SCTP,    &ipv6_sctp_tmplt},
-       {pattern_eth_ipv4_gtpu_ipv6,            ICE_RSS_TYPE_GTPU_IPV6,         &eth_inner_ipv6_tmplt},
-       {pattern_eth_ipv4_gtpu_ipv6_udp,        ICE_RSS_TYPE_GTPU_IPV6_UDP,     &eth_inner_ipv6_udp_tmplt},
-       {pattern_eth_ipv4_gtpu_ipv6_tcp,        ICE_RSS_TYPE_GTPU_IPV6_TCP,     &eth_inner_ipv6_tcp_tmplt},
-       {pattern_eth_ipv6_gtpu_ipv6,            ICE_RSS_TYPE_GTPU_IPV6,         &eth_inner_ipv6_tmplt},
-       {pattern_eth_ipv6_gtpu_ipv6_udp,        ICE_RSS_TYPE_GTPU_IPV6_UDP,     &eth_inner_ipv6_udp_tmplt},
-       {pattern_eth_ipv6_gtpu_ipv6_tcp,        ICE_RSS_TYPE_GTPU_IPV6_TCP,     &eth_inner_ipv6_tcp_tmplt},
-       {pattern_eth_ipv4_gtpu_eh_ipv6,         ICE_RSS_TYPE_GTPU_IPV6,         &eth_inner_ipv6_tmplt},
-       {pattern_eth_ipv4_gtpu_eh_ipv6_udp,     ICE_RSS_TYPE_GTPU_IPV6_UDP,     &eth_inner_ipv6_udp_tmplt},
-       {pattern_eth_ipv4_gtpu_eh_ipv6_tcp,     ICE_RSS_TYPE_GTPU_IPV6_TCP,     &eth_inner_ipv6_tcp_tmplt},
-       {pattern_eth_ipv6_gtpu_eh_ipv6,         ICE_RSS_TYPE_GTPU_IPV6,         &eth_inner_ipv6_tmplt},
-       {pattern_eth_ipv6_gtpu_eh_ipv6_udp,     ICE_RSS_TYPE_GTPU_IPV6_UDP,     &eth_inner_ipv6_udp_tmplt},
-       {pattern_eth_ipv6_gtpu_eh_ipv6_tcp,     ICE_RSS_TYPE_GTPU_IPV6_TCP,     &eth_inner_ipv6_tcp_tmplt},
-       {pattern_eth_pppoes_ipv6,               ICE_RSS_TYPE_OUTER_IPV6,        &ipv6_tmplt},
-       {pattern_eth_pppoes_ipv6_udp,           ICE_RSS_TYPE_OUTER_IPV6_UDP,    &ipv6_udp_tmplt},
-       {pattern_eth_pppoes_ipv6_tcp,           ICE_RSS_TYPE_OUTER_IPV6_TCP,    &ipv6_tcp_tmplt},
+       {pattern_eth_ipv4_gtpu_ipv6,            ICE_RSS_TYPE_GTPU_IPV6,         &outer_ipv4_inner_ipv6_tmplt},
+       {pattern_eth_ipv4_gtpu_ipv6_udp,        ICE_RSS_TYPE_GTPU_IPV6_UDP,     &outer_ipv4_inner_ipv6_udp_tmplt},
+       {pattern_eth_ipv4_gtpu_ipv6_tcp,        ICE_RSS_TYPE_GTPU_IPV6_TCP,     &outer_ipv4_inner_ipv6_tcp_tmplt},
+       {pattern_eth_ipv6_gtpu_ipv6,            ICE_RSS_TYPE_GTPU_IPV6,         &outer_ipv6_inner_ipv6_tmplt},
+       {pattern_eth_ipv6_gtpu_ipv6_udp,        ICE_RSS_TYPE_GTPU_IPV6_UDP,     &outer_ipv6_inner_ipv6_udp_tmplt},
+       {pattern_eth_ipv6_gtpu_ipv6_tcp,        ICE_RSS_TYPE_GTPU_IPV6_TCP,     &outer_ipv6_inner_ipv6_tcp_tmplt},
+       {pattern_eth_ipv4_gtpu_eh_ipv6,         ICE_RSS_TYPE_GTPU_IPV6,         &outer_ipv4_inner_ipv6_tmplt},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_udp,     ICE_RSS_TYPE_GTPU_IPV6_UDP,     &outer_ipv4_inner_ipv6_udp_tmplt},
+       {pattern_eth_ipv4_gtpu_eh_ipv6_tcp,     ICE_RSS_TYPE_GTPU_IPV6_TCP,     &outer_ipv4_inner_ipv6_tcp_tmplt},
+       {pattern_eth_ipv6_gtpu_eh_ipv6,         ICE_RSS_TYPE_GTPU_IPV6,         &outer_ipv6_inner_ipv6_tmplt},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_udp,     ICE_RSS_TYPE_GTPU_IPV6_UDP,     &outer_ipv6_inner_ipv6_udp_tmplt},
+       {pattern_eth_ipv6_gtpu_eh_ipv6_tcp,     ICE_RSS_TYPE_GTPU_IPV6_TCP,     &outer_ipv6_inner_ipv6_tcp_tmplt},
+       {pattern_eth_pppoes_ipv6,               ICE_RSS_TYPE_PPPOE_IPV6,        &ipv6_tmplt},
+       {pattern_eth_pppoes_ipv6_udp,           ICE_RSS_TYPE_PPPOE_IPV6_UDP,    &ipv6_udp_tmplt},
+       {pattern_eth_pppoes_ipv6_tcp,           ICE_RSS_TYPE_PPPOE_IPV6_TCP,    &ipv6_tcp_tmplt},
        {pattern_eth_ipv6_esp,                  ICE_RSS_TYPE_IPV6_ESP,          &eth_ipv6_esp_tmplt},
        {pattern_eth_ipv6_udp_esp,              ICE_RSS_TYPE_IPV6_ESP,          &eth_ipv6_udp_esp_tmplt},
        {pattern_eth_ipv6_ah,                   ICE_RSS_TYPE_IPV6_AH,           &eth_ipv6_ah_tmplt},
@@ -490,19 +534,10 @@ static struct ice_flow_engine ice_hash_engine = {
 };
 
 /* Register parser for os package. */
-static struct ice_flow_parser ice_hash_parser_os = {
+static struct ice_flow_parser ice_hash_parser = {
        .engine = &ice_hash_engine,
-       .array = ice_hash_pattern_list_os,
-       .array_len = RTE_DIM(ice_hash_pattern_list_os),
-       .parse_pattern_action = ice_hash_parse_pattern_action,
-       .stage = ICE_FLOW_STAGE_RSS,
-};
-
-/* Register parser for comms package. */
-static struct ice_flow_parser ice_hash_parser_comms = {
-       .engine = &ice_hash_engine,
-       .array = ice_hash_pattern_list_comms,
-       .array_len = RTE_DIM(ice_hash_pattern_list_comms),
+       .array = ice_hash_pattern_list,
+       .array_len = RTE_DIM(ice_hash_pattern_list),
        .parse_pattern_action = ice_hash_parse_pattern_action,
        .stage = ICE_FLOW_STAGE_RSS,
 };
@@ -521,12 +556,7 @@ ice_hash_init(struct ice_adapter *ad)
        if (ad->hw.dcf_enabled)
                return 0;
 
-       if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
-               parser = &ice_hash_parser_os;
-       else if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
-               parser = &ice_hash_parser_comms;
-       else
-               return -EINVAL;
+       parser = &ice_hash_parser;
 
        return ice_register_parser(parser, ad);
 }
@@ -838,6 +868,13 @@ ice_any_invalid_rss_type(enum rte_eth_hash_function rss_func,
                if (rss_type & (ETH_RSS_L3_SRC_ONLY | ETH_RSS_L3_DST_ONLY |
                    ETH_RSS_L4_SRC_ONLY | ETH_RSS_L4_DST_ONLY))
                        return true;
+
+               if (!(rss_type &
+                  (ETH_RSS_IPV4 | ETH_RSS_IPV6 |
+                   ETH_RSS_NONFRAG_IPV4_UDP | ETH_RSS_NONFRAG_IPV6_UDP |
+                   ETH_RSS_NONFRAG_IPV4_TCP | ETH_RSS_NONFRAG_IPV6_TCP |
+                   ETH_RSS_NONFRAG_IPV4_SCTP | ETH_RSS_NONFRAG_IPV6_SCTP)))
+                       return true;
        }
 
        /* check invalid combination */
@@ -931,7 +968,6 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                        rss_meta->cfg = *cfg;
                        ice_refine_hash_cfg(&rss_meta->cfg,
                                            rss_type, pattern_hint);
-
                        break;
                case RTE_FLOW_ACTION_TYPE_END:
                        break;
@@ -970,8 +1006,8 @@ ice_hash_parse_pattern_action(__rte_unused struct ice_adapter *ad,
        }
 
        /* Check rss supported pattern and find matched pattern. */
-       pattern_match_item = ice_search_pattern_match_item(pattern,
-                                       array, array_len, error);
+       pattern_match_item = ice_search_pattern_match_item(ad, pattern, array,
+                                                          array_len, error);
        if (!pattern_match_item) {
                ret = -rte_errno;
                goto error;
@@ -1103,10 +1139,7 @@ ice_hash_uninit(struct ice_adapter *ad)
        if (ad->hw.dcf_enabled)
                return;
 
-       if (ad->active_pkg_type == ICE_PKG_TYPE_OS_DEFAULT)
-               ice_unregister_parser(&ice_hash_parser_os, ad);
-       else if (ad->active_pkg_type == ICE_PKG_TYPE_COMMS)
-               ice_unregister_parser(&ice_hash_parser_comms, ad);
+       ice_unregister_parser(&ice_hash_parser, ad);
 }
 
 static void
DPDK repo used for reviews