Commit 2bdc97be authored by Bruce Allan's avatar Bruce Allan Committed by Jeff Kirsher
Browse files

ice: add and use new ice_for_each_traffic_class() macro 



There are numerous for() loops iterating over each of the max traffic
classes.  Use a simple iterator macro instead to make the code cleaner.

Signed-off-by: default avatarBruce Allan <bruce.w.allan@intel.com>
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 105e5bc2

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

+1 −1
Original line number Diff line number Diff line
@@ -2949,7 +2949,7 @@ ice_cfg_vsi_qs(struct ice_port_info *pi, u16 vsi_handle, u8 tc_bitmap, 


	mutex_lock(&pi->sched_lock);



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

	ice_for_each_traffic_class(i) {

		/* configuration is possible only if TC node is present */

		if (!ice_sched_get_tc_node(pi, i))

			continue;

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

+2 −2
Original line number Diff line number Diff line
@@ -856,7 +856,7 @@ static void ice_vsi_setup_q_map(struct ice_vsi *vsi, struct ice_vsi_ctx *ctxt) 
	/* find the (rounded up) power-of-2 of qcount */

	pow = order_base_2(qcount_rx);



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

	ice_for_each_traffic_class(i) {

		if (!(vsi->tc_cfg.ena_tc & BIT(i))) {

			/* TC is not enabled */

			vsi->tc_cfg.tc_info[i].qoffset = 0;
@@ -1689,7 +1689,7 @@ ice_vsi_cfg_txqs(struct ice_vsi *vsi, struct ice_ring **rings, int offset) 
	num_q_grps = 1;



	/* set up and configure the Tx queues for each enabled TC */

	for (tc = 0; tc < ICE_MAX_TRAFFIC_CLASS; tc++) {

	ice_for_each_traffic_class(tc) {

		if (!(vsi->tc_cfg.ena_tc & BIT(tc)))

			break;

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

+1 −1
Original line number Diff line number Diff line
@@ -1606,7 +1606,7 @@ ice_sched_rm_vsi_cfg(struct ice_port_info *pi, u16 vsi_handle, u8 owner) 
	if (!vsi_ctx)

		goto exit_sched_rm_vsi_cfg;



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

	ice_for_each_traffic_class(i) {

		struct ice_sched_node *vsi_node, *tc_node;

		u8 j = 0;

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

+3 −0
Original line number Diff line number Diff line
@@ -210,6 +210,9 @@ struct ice_nvm_info { 
#define ICE_MAX_TRAFFIC_CLASS 8

#define ICE_TXSCHED_MAX_BRANCHES ICE_MAX_TRAFFIC_CLASS



#define ice_for_each_traffic_class(_i)	\

	for ((_i) = 0; (_i) < ICE_MAX_TRAFFIC_CLASS; (_i)++)



struct ice_sched_node {

	struct ice_sched_node *parent;

	struct ice_sched_node *sibling; /* next sibling in the same layer */

CRA Git | Maintained and supported by SUSTech CRA and CCSE