Commit 1d2ac128 authored by Marcin Szycik's avatar Marcin Szycik Committed by Tony Nguyen
Browse files

ice: Remove unused members from switch API 



Remove several members of struct ice_sw_recipe and struct
ice_prot_lkup_ext. Remove struct ice_recp_grp_entry and struct
ice_pref_recipe_group, since they are now unused as well.

All of the deleted members were only written to and never read, so it's
pointless to keep them.

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 2ecdd4ba

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

+0 −7
Original line number Diff line number Diff line
@@ -961,14 +961,7 @@ static void ice_cleanup_fltr_mgmt_struct(struct ice_hw *hw) 
	}

	recps = sw->recp_list;

	for (i = 0; i < ICE_MAX_NUM_RECIPES; i++) {

		struct ice_recp_grp_entry *rg_entry, *tmprg_entry;



		recps[i].root_rid = i;

		list_for_each_entry_safe(rg_entry, tmprg_entry,

					 &recps[i].rg_list, l_entry) {

			list_del(&rg_entry->l_entry);

			devm_kfree(ice_hw_to_dev(hw), rg_entry);

		}



		if (recps[i].adv_rule) {

			struct ice_adv_fltr_mgmt_list_entry *tmp_entry;

drivers/net/ethernet/intel/ice/ice_protocol_type.h

+0 −17
Original line number Diff line number Diff line
@@ -455,7 +455,6 @@ struct ice_prot_ext_tbl_entry { 


/* Extractions to be looked up for a given recipe */

struct ice_prot_lkup_ext {

	u16 prot_type;

	u8 n_val_words;

	/* create a buffer to hold max words per recipe */

	u16 field_mask[ICE_MAX_CHAIN_WORDS];
@@ -463,20 +462,4 @@ struct ice_prot_lkup_ext { 
	struct ice_fv_word fv_words[ICE_MAX_CHAIN_WORDS];

};



struct ice_pref_recipe_group {

	u8 n_val_pairs;		/* Number of valid pairs */

	struct ice_fv_word pairs[ICE_NUM_WORDS_RECIPE];

	u16 mask[ICE_NUM_WORDS_RECIPE];

};



struct ice_recp_grp_entry {

	struct list_head l_entry;



#define ICE_INVAL_CHAIN_IND 0xFF

	u16 rid;

	u8 chain_idx;

	u16 fv_idx[ICE_NUM_WORDS_RECIPE];

	u16 fv_mask[ICE_NUM_WORDS_RECIPE];

	struct ice_pref_recipe_group r_group;

};

#endif /* _ICE_PROTOCOL_TYPE_H_ */

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

+10 −41
Original line number Diff line number Diff line
@@ -1471,7 +1471,6 @@ int ice_init_def_sw_recp(struct ice_hw *hw) 
		recps[i].root_rid = i;

		INIT_LIST_HEAD(&recps[i].filt_rules);

		INIT_LIST_HEAD(&recps[i].filt_replay_rules);

		INIT_LIST_HEAD(&recps[i].rg_list);

		mutex_init(&recps[i].filt_rule_lock);

	}
@@ -2339,18 +2338,10 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid, 


	for (sub_recps = 0; sub_recps < num_recps; sub_recps++) {

		struct ice_aqc_recipe_data_elem root_bufs = tmp[sub_recps];

		struct ice_recp_grp_entry *rg_entry;

		u8 i, prof, idx, prot = 0;

		bool is_root;

		u16 off = 0;



		rg_entry = devm_kzalloc(ice_hw_to_dev(hw), sizeof(*rg_entry),

					GFP_KERNEL);

		if (!rg_entry) {

			status = -ENOMEM;

			goto err_unroll;

		}



		idx = root_bufs.recipe_indx;

		is_root = root_bufs.content.rid & ICE_AQ_RECIPE_ID_IS_ROOT;
@@ -2364,10 +2355,7 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid, 
				      ICE_MAX_NUM_PROFILES);

		for (i = 0; i < ICE_NUM_WORDS_RECIPE; i++) {

			u8 lkup_indx = root_bufs.content.lkup_indx[i];



			rg_entry->fv_idx[i] = lkup_indx;

			rg_entry->fv_mask[i] =

				le16_to_cpu(root_bufs.content.mask[i]);

			u16 lkup_mask = le16_to_cpu(root_bufs.content.mask[i]);



			/* If the recipe is a chained recipe then all its

			 * child recipe's result will have a result index.
@@ -2378,26 +2366,21 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid, 
			 * has ICE_AQ_RECIPE_LKUP_IGNORE or 0 since it isn't a

			 * valid offset value.

			 */

			if (test_bit(rg_entry->fv_idx[i], hw->switch_info->prof_res_bm[prof]) ||

			    rg_entry->fv_idx[i] & ICE_AQ_RECIPE_LKUP_IGNORE ||

			    rg_entry->fv_idx[i] == 0)

			if (!lkup_indx ||

			    (lkup_indx & ICE_AQ_RECIPE_LKUP_IGNORE) ||

			    test_bit(lkup_indx,

				     hw->switch_info->prof_res_bm[prof]))

				continue;



			ice_find_prot_off(hw, ICE_BLK_SW, prof,

					  rg_entry->fv_idx[i], &prot, &off);

			ice_find_prot_off(hw, ICE_BLK_SW, prof, lkup_indx,

					  &prot, &off);

			lkup_exts->fv_words[fv_word_idx].prot_id = prot;

			lkup_exts->fv_words[fv_word_idx].off = off;

			lkup_exts->field_mask[fv_word_idx] =

				rg_entry->fv_mask[i];

			lkup_exts->field_mask[fv_word_idx] = lkup_mask;

			fv_word_idx++;

		}

		/* populate rg_list with the data from the child entry of this

		 * recipe

		 */

		list_add(&rg_entry->l_entry, &recps[rid].rg_list);



		/* Propagate some data to the recipe database */

		recps[idx].is_root = !!is_root;

		recps[idx].priority = root_bufs.content.act_ctrl_fwd_priority;

		recps[idx].need_pass_l2 = root_bufs.content.act_ctrl &

					  ICE_AQ_RECIPE_ACT_NEED_PASS_L2;
@@ -2405,11 +2388,8 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid, 
					   ICE_AQ_RECIPE_ACT_ALLOW_PASS_L2;

		bitmap_zero(recps[idx].res_idxs, ICE_MAX_FV_WORDS);

		if (root_bufs.content.result_indx & ICE_AQ_RECIPE_RESULT_EN) {

			recps[idx].chain_idx = root_bufs.content.result_indx &

				~ICE_AQ_RECIPE_RESULT_EN;

			set_bit(recps[idx].chain_idx, recps[idx].res_idxs);

		} else {

			recps[idx].chain_idx = ICE_INVAL_CHAIN_IND;

			set_bit(root_bufs.content.result_indx &

				~ICE_AQ_RECIPE_RESULT_EN, recps[idx].res_idxs);

		}



		if (!is_root) {
@@ -2429,8 +2409,6 @@ ice_get_recp_frm_fw(struct ice_hw *hw, struct ice_sw_recipe *recps, u8 rid, 


	/* Complete initialization of the root recipe entry */

	lkup_exts->n_val_words = fv_word_idx;

	recps[rid].big_recp = (num_recps > 1);

	recps[rid].n_grp_count = (u8)num_recps;



	/* Copy result indexes */

	bitmap_copy(recps[rid].res_idxs, result_bm, ICE_MAX_FV_WORDS);
@@ -5157,7 +5135,6 @@ ice_add_sw_recipe(struct ice_hw *hw, struct ice_sw_recipe *rm, 
		return status;



	recipe = &hw->switch_info->recp_list[rid];

	recipe->is_root = true;

	root = &buf[recp_cnt - 1];

	fill_recipe_template(root, rid, rm);
@@ -5317,9 +5294,7 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, 
	DECLARE_BITMAP(fv_bitmap, ICE_MAX_NUM_PROFILES);

	DECLARE_BITMAP(profiles, ICE_MAX_NUM_PROFILES);

	struct ice_prot_lkup_ext *lkup_exts;

	struct ice_recp_grp_entry *r_entry;

	struct ice_sw_fv_list_entry *fvit;

	struct ice_recp_grp_entry *r_tmp;

	struct ice_sw_fv_list_entry *tmp;

	struct ice_sw_recipe *rm;

	int status = 0;
@@ -5361,7 +5336,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, 
	 * headers being programmed.

	 */

	INIT_LIST_HEAD(&rm->fv_list);

	INIT_LIST_HEAD(&rm->rg_list);



	/* Get bitmap of field vectors (profiles) that are compatible with the

	 * rule request; only these will be searched in the subsequent call to
@@ -5465,11 +5439,6 @@ ice_add_adv_recipe(struct ice_hw *hw, struct ice_adv_lkup_elem *lkups, 
	}



err_unroll:

	list_for_each_entry_safe(r_entry, r_tmp, &rm->rg_list, l_entry) {

		list_del(&r_entry->l_entry);

		devm_kfree(ice_hw_to_dev(hw), r_entry);

	}



	list_for_each_entry_safe(fvit, tmp, &rm->fv_list, list_entry) {

		list_del(&fvit->list_entry);

		devm_kfree(ice_hw_to_dev(hw), fvit);

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

+0 −16
Original line number Diff line number Diff line
@@ -216,7 +216,6 @@ struct ice_sw_recipe { 
	/* For a chained recipe the root recipe is what should be used for

	 * programming rules

	 */

	u8 is_root;

	u8 root_rid;

	u8 recp_created;
@@ -230,19 +229,6 @@ struct ice_sw_recipe { 
	u8 fv_idx[ICE_MAX_CHAIN_WORDS];

	u16 fv_mask[ICE_MAX_CHAIN_WORDS];



	/* if this recipe is a collection of other recipe */

	u8 big_recp;



	/* if this recipe is part of another bigger recipe then chain index

	 * corresponding to this recipe

	 */

	u8 chain_idx;



	/* if this recipe is a collection of other recipe then count of other

	 * recipes and recipe IDs of those recipes

	 */

	u8 n_grp_count;



	/* Bit map specifying the IDs associated with this group of recipe */

	DECLARE_BITMAP(r_bitmap, ICE_MAX_NUM_RECIPES);
@@ -274,8 +260,6 @@ struct ice_sw_recipe { 
	u8 need_pass_l2:1;

	u8 allow_pass_l2:1;



	struct list_head rg_list;



	/* This struct saves the fv_words for a given lookup */

	struct ice_prot_lkup_ext lkup_exts;

};