Commit c5639084 authored by Michal Swiatkowski's avatar Michal Swiatkowski Committed by Tony Nguyen
Browse files

ice: Remove reading all recipes before adding a new one 



The content of the first read recipe is used as a template when adding a
recipe. It isn't needed - only prune index is directly set from there. Set
it in the code instead. Also, now there's no need to set rid and lookup
indexes to 0, as the whole recipe buffer is initialized to 0.

Signed-off-by: default avatarMichal Swiatkowski <michal.swiatkowski@linux.intel.com>
Reviewed-by: default avatarPrzemek Kitszel <przemyslaw.kitszel@intel.com>
Signed-off-by: default avatarMarcin Szycik <marcin.szycik@linux.intel.com>
Tested-by: default avatarSujai Buvaneswaran <sujai.buvaneswaran@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent e247267b

drivers/net/ethernet/intel/ice/ice_switch.c

+2 −27
Original line number Diff line number Diff line
@@ -5079,11 +5079,9 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 
{

	DECLARE_BITMAP(result_idx_bm, ICE_MAX_FV_WORDS);

	struct ice_aqc_recipe_content *content;

	struct ice_aqc_recipe_data_elem *tmp;

	struct ice_aqc_recipe_data_elem *buf;

	struct ice_recp_grp_entry *entry;

	u16 free_res_idx;

	u16 recipe_count;

	u8 chain_idx;

	u8 recps = 0;

	int status;
@@ -5110,10 +5108,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 
	if (rm->n_grp_count > ICE_MAX_CHAIN_RECIPE)

		return -ENOSPC;



	tmp = kcalloc(ICE_MAX_NUM_RECIPES, sizeof(*tmp), GFP_KERNEL);

	if (!tmp)

		return -ENOMEM;



	buf = devm_kcalloc(ice_hw_to_dev(hw), rm->n_grp_count, sizeof(*buf),

			   GFP_KERNEL);

	if (!buf) {
@@ -5122,11 +5116,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 
	}



	bitmap_zero(rm->r_bitmap, ICE_MAX_NUM_RECIPES);

	recipe_count = ICE_MAX_NUM_RECIPES;

	status = ice_aq_get_recipe(hw, tmp, &recipe_count, ICE_SW_LKUP_MAC,

				   NULL);

	if (status || recipe_count == 0)

		goto err_unroll;



	/* Allocate the recipe resources, and configure them according to the

	 * match fields from protocol headers and extracted field vectors.
@@ -5141,19 +5130,9 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 


		content = &buf[recps].content;



		/* Clear the result index of the located recipe, as this will be

		 * updated, if needed, later in the recipe creation process.

		 */

		tmp[0].content.result_indx = 0;



		buf[recps] = tmp[0];

		buf[recps].recipe_indx = (u8)entry->rid;

		/* if the recipe is a non-root recipe RID should be programmed

		 * as 0 for the rules to be applied correctly.

		 */

		content->rid = 0;

		memset(&content->lkup_indx, 0,

		       sizeof(content->lkup_indx));



		buf[recps].content.act_ctrl |= ICE_AQ_RECIPE_ACT_PRUNE_INDX_M;



		/* All recipes use look-up index 0 to match switch ID. */

		content->lkup_indx[0] = ICE_AQ_SW_ID_LKUP_IDX;
@@ -5192,8 +5171,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 
		}



		/* fill recipe dependencies */

		bitmap_zero((unsigned long *)buf[recps].recipe_bitmap,

			    ICE_MAX_NUM_RECIPES);

		set_bit(buf[recps].recipe_indx,

			(unsigned long *)buf[recps].recipe_bitmap);

		content->act_ctrl_fwd_priority = rm->priority;
@@ -5357,12 +5334,10 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 
		recp->recp_created = true;

	}

	rm->root_buf = buf;

	kfree(tmp);

	return status;



err_unroll:

err_mem:

	kfree(tmp);

	devm_kfree(ice_hw_to_dev(hw), buf);

	return status;

}