net/ice: fix error set of queue number
PATCH 1/1 net/ice: fix error set of queue number
The queue number actually applied should be the maximum integer power of 2 less than or equal to min(vsi->nb_qps, ICE_MAX_Q_PER_TC), so we need to get the most significant 1 bit. However the return value of function rte_bsf32 is the least significant 1 bit. This patch replaces the function rte_bsf32 with the function rte_fls_u32 and adds necessary boundary check.
Signed-off-by Wenjun Wu <[email protected]>
--- drivers/net/ice/ice_ethdev.c | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)
drivers/net/ice/ice_ethdev.c +4 -4
@@ -808,7 +808,7 @@ ice_vsi_config_tc_queue_mapping(struct ice_vsi *vsi, struct ice_aqc_vsi_props *info, uint8_t enabled_tcmap) { -uint16_t bsf, qp_idx; +uint16_t fls, qp_idx;/* default tc 0 now. Multi-TC supporting need to be done later. * Configure TC and queue mapping parameters, for enabled TC,
@@ -820,15 +820,15 @@ ice_vsi_config_tc_queue_mapping(struct ice_vsi *vsi, } vsi->nb_qps =RTE_MIN (vsi->nb_qps,ICE_MAX_Q_PER_TC ); - bsf =rte_bsf32 (vsi->nb_qps); + fls = (vsi->nb_qps ==0 ) ?0 :rte_fls_u32 (vsi->nb_qps) -1 ;/* Adjust the queue number to actual queues that can be applied */ - vsi->nb_qps =0x1 << bsf; + vsi->nb_qps = (vsi->nb_qps ==0 ) ?0 :0x1 << fls; qp_idx =0 ;/* Set tc and queue mapping with VSI */ info->tc_mapping[0 ] =rte_cpu_to_le_16 ((qp_idx <<ICE_AQ_VSI_TC_Q_OFFSET_S ) | - (bsf <<ICE_AQ_VSI_TC_Q_NUM_S )); + (fls <<ICE_AQ_VSI_TC_Q_NUM_S ));/* Associate queue number with VSI */ info->mapping_flags |=rte_cpu_to_le_16 (ICE_AQ_VSI_Q_MAP_CONTIG );
Signature · 1 line
2.25.1