Commit be8ff000 authored by Anirudh Venkataramanan's avatar Anirudh Venkataramanan Committed by Jeff Kirsher
Browse files

ice: Fix forward to queue group logic 



When adding a rule, queue region size needs to be provided as log base 2
of the number of queues in region. Fix that.

Signed-off-by: default avatarAnirudh Venkataramanan <anirudh.venkataramanan@intel.com>
Tested-by: default avatarAndrew Bowers <andrewx.bowers@intel.com>
Signed-off-by: default avatarJeff Kirsher <jeffrey.t.kirsher@intel.com>
parent 7c4bc1f5

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

+10 −4
Original line number Diff line number Diff line
@@ -656,6 +656,7 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info, 
	u8 *eth_hdr;

	u32 act = 0;

	__be16 *off;

	u8 q_rgn;



	if (opc == ice_aqc_opc_remove_sw_rules) {

		s_rule->pdata.lkup_tx_rx.act = 0;
@@ -694,14 +695,19 @@ ice_fill_sw_rule(struct ice_hw *hw, struct ice_fltr_info *f_info, 
		act |= (f_info->fwd_id.q_id << ICE_SINGLE_ACT_Q_INDEX_S) &

			ICE_SINGLE_ACT_Q_INDEX_M;

		break;

	case ICE_DROP_PACKET:

		act |= ICE_SINGLE_ACT_VSI_FORWARDING | ICE_SINGLE_ACT_DROP |

			ICE_SINGLE_ACT_VALID_BIT;

		break;

	case ICE_FWD_TO_QGRP:

		q_rgn = f_info->qgrp_size > 0 ?

			(u8)ilog2(f_info->qgrp_size) : 0;

		act |= ICE_SINGLE_ACT_TO_Q;

		act |= (f_info->qgrp_size << ICE_SINGLE_ACT_Q_REGION_S) &

		act |= (f_info->fwd_id.q_id << ICE_SINGLE_ACT_Q_INDEX_S) &

			ICE_SINGLE_ACT_Q_INDEX_M;

		act |= (q_rgn << ICE_SINGLE_ACT_Q_REGION_S) &

			ICE_SINGLE_ACT_Q_REGION_M;

		break;

	case ICE_DROP_PACKET:

		act |= ICE_SINGLE_ACT_VSI_FORWARDING | ICE_SINGLE_ACT_DROP;

		break;

	default:

		return;

	}