net/ice/base: add profile validation on switch filter

[dpdk.git] / drivers / net / ice / base / ice_flex_pipe.c

diff --git a/drivers/net/ice/base/ice_flex_pipe.c b/drivers/net/ice/base/ice_flex_pipe.c
index 06a2339..f6a29f8 100644 (file)
--- a/drivers/net/ice/base/ice_flex_pipe.c
+++ b/drivers/net/ice/base/ice_flex_pipe.c
@@ -1785,8 +1785,12 @@ static enum ice_prof_type
 ice_get_sw_prof_type(struct ice_hw *hw, struct ice_fv *fv)
 {
        u16 i;
+       bool valid_prof = false;
 
        for (i = 0; i < hw->blk[ICE_BLK_SW].es.fvw; i++) {
+               if (fv->ew[i].off != ICE_NAN_OFFSET)
+                       valid_prof = true;
+
                /* UDP tunnel will have UDP_OF protocol ID and VNI offset */
                if (fv->ew[i].prot_id == (u8)ICE_PROT_UDP_OF &&
                    fv->ew[i].off == ICE_VNI_OFFSET)
@@ -1801,7 +1805,7 @@ ice_get_sw_prof_type(struct ice_hw *hw, struct ice_fv *fv)
                        return ICE_PROF_TUN_PPPOE;
        }
 
-       return ICE_PROF_NON_TUN;
+       return valid_prof ? ICE_PROF_NON_TUN : ICE_PROF_INVALID;
 }
 
 /**
@@ -1818,11 +1822,6 @@ ice_get_sw_fv_bitmap(struct ice_hw *hw, enum ice_prof_type req_profs,
        struct ice_seg *ice_seg;
        struct ice_fv *fv;
 
-       if (req_profs == ICE_PROF_ALL) {
-               ice_bitmap_set(bm, 0, ICE_MAX_NUM_PROFILES);
-               return;
-       }
-
        ice_memset(&state, 0, sizeof(state), ICE_NONDMA_MEM);
        ice_zero_bitmap(bm, ICE_MAX_NUM_PROFILES);
        ice_seg = hw->seg;
@@ -6365,3 +6364,52 @@ err_ice_rem_prof_id_flow:
 
        return status;
 }
+
+/**
+ * ice_flow_assoc_hw_prof - add profile id flow for main/ctrl VSI flow entry
+ * @hw: pointer to the HW struct
+ * @blk: HW block
+ * @dest_vsi_handle: dest VSI handle
+ * @fdir_vsi_handle: fdir programming VSI handle
+ * @id: profile id (handle)
+ *
+ * Calling this function will update the hardware tables to enable the
+ * profile indicated by the ID parameter for the VSIs specified in the VSI
+ * array. Once successfully called, the flow will be enabled.
+ */
+enum ice_status
+ice_flow_assoc_hw_prof(struct ice_hw *hw, enum ice_block blk,
+                      u16 dest_vsi_handle, u16 fdir_vsi_handle, int id)
+{
+       enum ice_status status = ICE_SUCCESS;
+       u16 vsi_num;
+
+       vsi_num = ice_get_hw_vsi_num(hw, dest_vsi_handle);
+       status = ice_add_prof_id_flow(hw, blk, vsi_num, id);
+       if (status) {
+               ice_debug(hw, ICE_DBG_FLOW, "HW profile add failed for main VSI flow entry, %d\n",
+                         status);
+               goto err_add_prof;
+       }
+
+       if (blk != ICE_BLK_FD)
+               return status;
+
+       vsi_num = ice_get_hw_vsi_num(hw, fdir_vsi_handle);
+       status = ice_add_prof_id_flow(hw, blk, vsi_num, id);
+       if (status) {
+               ice_debug(hw, ICE_DBG_FLOW, "HW profile add failed for ctrl VSI flow entry, %d\n",
+                         status);
+               goto err_add_entry;
+       }
+
+       return status;
+
+err_add_entry:
+       vsi_num = ice_get_hw_vsi_num(hw, dest_vsi_handle);
+       ice_rem_prof_id_flow(hw, blk, vsi_num, id);
+err_add_prof:
+       ice_flow_rem_prof(hw, blk, id);
+
+       return status;
+}