Commit c36a2b97 authored by Victor Raj's avatar Victor Raj Committed by Tony Nguyen
Browse files

ice: replay advanced rules after reset 



ice_replay_vsi_adv_rule will replay advanced rules for a given VSI.
Exit this function when list of rules for given recipe is empty.
Do not add rule when given vsi_handle does not match vsi_handle
from the rule info.

Use ICE_MAX_NUM_RECIPES instead of ICE_SW_LKUP_LAST in order to find
advanced rules as well.

Signed-off-by: default avatarVictor Raj <victor.raj@intel.com>
Signed-off-by: default avatarWojciech Drewek <wojciech.drewek@intel.com>
Tested-by: default avatarSandeep Penigalapati <sandeep.penigalapati@intel.com>
Signed-off-by: default avatarTony Nguyen <anthony.l.nguyen@intel.com>
parent 710ad98c

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

+1 −1
Original line number Diff line number Diff line
@@ -4603,7 +4603,7 @@ static int ice_replay_pre_init(struct ice_hw *hw) 
	 * will allow adding rules entries back to filt_rules list,

	 * which is operational list.

	 */

	for (i = 0; i < ICE_SW_LKUP_LAST; i++)

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

		list_replace_init(&sw->recp_list[i].filt_rules,

				  &sw->recp_list[i].filt_replay_rules);

	ice_sched_replay_agg_vsi_preinit(hw);

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

+38 −3
Original line number Diff line number Diff line
@@ -5651,6 +5651,38 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw, 
	return -ENOENT;

}



/**

 * ice_replay_vsi_adv_rule - Replay advanced rule for requested VSI

 * @hw: pointer to the hardware structure

 * @vsi_handle: driver VSI handle

 * @list_head: list for which filters need to be replayed

 *

 * Replay the advanced rule for the given VSI.

 */

static int

ice_replay_vsi_adv_rule(struct ice_hw *hw, u16 vsi_handle,

			struct list_head *list_head)

{

	struct ice_rule_query_data added_entry = { 0 };

	struct ice_adv_fltr_mgmt_list_entry *adv_fltr;

	int status = 0;



	if (list_empty(list_head))

		return status;

	list_for_each_entry(adv_fltr, list_head, list_entry) {

		struct ice_adv_rule_info *rinfo = &adv_fltr->rule_info;

		u16 lk_cnt = adv_fltr->lkups_cnt;



		if (vsi_handle != rinfo->sw_act.vsi_handle)

			continue;

		status = ice_add_adv_rule(hw, adv_fltr->lkups, lk_cnt, rinfo,

					  &added_entry);

		if (status)

			break;

	}

	return status;

}



/**

 * ice_replay_vsi_all_fltr - replay all filters stored in bookkeeping lists

 * @hw: pointer to the hardware structure
@@ -5661,14 +5693,17 @@ ice_rem_adv_rule_by_id(struct ice_hw *hw, 
int ice_replay_vsi_all_fltr(struct ice_hw *hw, u16 vsi_handle)

{

	struct ice_switch_info *sw = hw->switch_info;

	int status = 0;

	int status;

	u8 i;



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

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

		struct list_head *head;



		head = &sw->recp_list[i].filt_replay_rules;

		if (!sw->recp_list[i].adv_rule)

			status = ice_replay_vsi_fltr(hw, vsi_handle, i, head);

		else

			status = ice_replay_vsi_adv_rule(hw, vsi_handle, head);

		if (status)

			return status;

	}