Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18a89ab7 authored by Gal Pressman's avatar Gal Pressman Committed by Saeed Mahameed
Browse files

net/mlx5e: E-Switch, Use the name of static array instead of its address 



Using the address of a static array is the same as using its name (in
this specific use-case), but it's confusing and makes the code less
readable.

Fixes: 1bd27b11 ("net/mlx5: Introduce E-switch QoS management")
Fixes: bd77bf1c ("net/mlx5: Add SRIOV VF max rate configuration support")
Signed-off-by: default avatarGal Pressman <galp@mellanox.com>
Signed-off-by: default avatarSaeed Mahameed <saeedm@mellanox.com>
parent 2c47bf80

drivers/net/ethernet/mellanox/mlx5/core/eswitch.c

+13 −13
Original line number Diff line number Diff line
@@ -1290,7 +1290,7 @@ static int esw_create_tsar(struct mlx5_eswitch *esw) 


	err = mlx5_create_scheduling_element_cmd(dev,

						 SCHEDULING_HIERARCHY_E_SWITCH,

						 &tsar_ctx,

						 tsar_ctx,

						 &esw->qos.root_tsar_id);

	if (err) {

		esw_warn(esw->dev, "E-Switch create TSAR failed (%d)\n", err);
@@ -1333,20 +1333,20 @@ static int esw_vport_enable_qos(struct mlx5_eswitch *esw, int vport_num, 
	if (vport->qos.enabled)

		return -EEXIST;



	MLX5_SET(scheduling_context, &sched_ctx, element_type,

	MLX5_SET(scheduling_context, sched_ctx, element_type,

		 SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);

	vport_elem = MLX5_ADDR_OF(scheduling_context, &sched_ctx,

	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,

				  element_attributes);

	MLX5_SET(vport_element, vport_elem, vport_number, vport_num);

	MLX5_SET(scheduling_context, &sched_ctx, parent_element_id,

	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,

		 esw->qos.root_tsar_id);

	MLX5_SET(scheduling_context, &sched_ctx, max_average_bw,

	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,

		 initial_max_rate);

	MLX5_SET(scheduling_context, &sched_ctx, bw_share, initial_bw_share);

	MLX5_SET(scheduling_context, sched_ctx, bw_share, initial_bw_share);



	err = mlx5_create_scheduling_element_cmd(dev,

						 SCHEDULING_HIERARCHY_E_SWITCH,

						 &sched_ctx,

						 sched_ctx,

						 &vport->qos.esw_tsar_ix);

	if (err) {

		esw_warn(esw->dev, "E-Switch create TSAR vport element failed (vport=%d,err=%d)\n",
@@ -1392,22 +1392,22 @@ static int esw_vport_qos_config(struct mlx5_eswitch *esw, int vport_num, 
	if (!vport->qos.enabled)

		return -EIO;



	MLX5_SET(scheduling_context, &sched_ctx, element_type,

	MLX5_SET(scheduling_context, sched_ctx, element_type,

		 SCHEDULING_CONTEXT_ELEMENT_TYPE_VPORT);

	vport_elem = MLX5_ADDR_OF(scheduling_context, &sched_ctx,

	vport_elem = MLX5_ADDR_OF(scheduling_context, sched_ctx,

				  element_attributes);

	MLX5_SET(vport_element, vport_elem, vport_number, vport_num);

	MLX5_SET(scheduling_context, &sched_ctx, parent_element_id,

	MLX5_SET(scheduling_context, sched_ctx, parent_element_id,

		 esw->qos.root_tsar_id);

	MLX5_SET(scheduling_context, &sched_ctx, max_average_bw,

	MLX5_SET(scheduling_context, sched_ctx, max_average_bw,

		 max_rate);

	MLX5_SET(scheduling_context, &sched_ctx, bw_share, bw_share);

	MLX5_SET(scheduling_context, sched_ctx, bw_share, bw_share);

	bitmask |= MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_MAX_AVERAGE_BW;

	bitmask |= MODIFY_SCHEDULING_ELEMENT_IN_MODIFY_BITMASK_BW_SHARE;



	err = mlx5_modify_scheduling_element_cmd(dev,

						 SCHEDULING_HIERARCHY_E_SWITCH,

						 &sched_ctx,

						 sched_ctx,

						 vport->qos.esw_tsar_ix,

						 bitmask);

	if (err) {