net/ice: fix GTPU down/uplink and extension conflict

[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 fdfaff7..c0271df 100644 (file)
--- a/drivers/net/ice/ice_hash.c
+++ b/drivers/net/ice/ice_hash.c
@@ -479,6 +479,8 @@ struct ice_hash_match_type ice_hash_type_list[] = {
                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)},
@@ -1148,21 +1150,25 @@ ice_hash_parse_action(struct ice_pattern_match_item *pattern_match_item,
                                BIT_ULL(ICE_FLOW_FIELD_IDX_NAT_T_ESP_SPI);
                        }
 
-                       /* update hash field for gtpu-ip and gtpu-eh. */
-                       if (rss_type != ETH_RSS_GTPU)
-                               break;
-                       else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_IP)
-                               hash_meta->hash_flds |=
-                               BIT_ULL(ICE_FLOW_FIELD_IDX_GTPU_IP_TEID);
-                       else if (hash_meta->pkt_hdr & ICE_FLOW_SEG_HDR_GTPU_EH)
+                       /* 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)
+                       } 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)
+                       } 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);
+                       }
 
                        break;
 
@@ -1271,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);
@@ -1315,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.