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

Commit 523ece88 authored by Eugenia Emantayev's avatar Eugenia Emantayev Committed by David S. Miller
Browse files

net/mlx4_en: Fix set port ratelimit for 40GE 



In 40GE we can't use the default bw units for set ratelimit (100 Mbps)
since the max is 255*100 Mbps = 25 Gbps (not suited for 40GE), thus we need 1 Gbps units.
But for 10GE 1 Gbps units might be too bruit so we use the following solution.

For user set ratelimit <= 25 Gbps:
        use 100 Mbps units * user_ratelimit (* 10).

For user set ratelimit > 25 Gbps:
        use 1 Gbps units * user_ratelimit.

For user set unlimited ratelimit (0 Gbps):
        use 1 Gbps units * MAX_RATELIMIT_DEFAULT (57)

Note: any value > 58 will damage the FW ratelimit computation, so we allow
      a max and any higher value will be pulled down to 57.

Signed-off-by: default avatarSagi Grimberg <sagig@mellanox.com>
Signed-off-by: default avatarEugenia Emantayev <eugenia@mellanox.com>
Signed-off-by: default avatarAmir Vadai <amirv@mellanox.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 9274f9f8

drivers/net/ethernet/mellanox/mlx4/mlx4.h

+0 −5
Original line number Diff line number Diff line
@@ -62,11 +62,6 @@ 


#define INIT_HCA_TPT_MW_ENABLE          (1 << 7)



#define MLX4_NUM_UP		8

#define MLX4_NUM_TC		8

#define MLX4_RATELIMIT_UNITS 3 /* 100 Mbps */

#define MLX4_RATELIMIT_DEFAULT 0xffff



struct mlx4_set_port_prio2tc_context {

	u8 prio2tc[4];

};

drivers/net/ethernet/mellanox/mlx4/port.c

+17 −5
Original line number Diff line number Diff line
@@ -1051,14 +1051,26 @@ int mlx4_SET_PORT_SCHEDULER(struct mlx4_dev *dev, u8 port, u8 *tc_tx_bw, 


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

		struct mlx4_port_scheduler_tc_cfg_be *tc = &context->tc[i];

		u16 r = ratelimit && ratelimit[i] ? ratelimit[i] :

			MLX4_RATELIMIT_DEFAULT;

		u16 r;



		if (ratelimit && ratelimit[i]) {

			if (ratelimit[i] <= MLX4_MAX_100M_UNITS_VAL) {

				r = ratelimit[i];

				tc->max_bw_units =

					htons(MLX4_RATELIMIT_100M_UNITS);

			} else {

				r = ratelimit[i]/10;

				tc->max_bw_units =

					htons(MLX4_RATELIMIT_1G_UNITS);

			}

			tc->max_bw_value = htons(r);

		} else {

			tc->max_bw_value = htons(MLX4_RATELIMIT_DEFAULT);

			tc->max_bw_units = htons(MLX4_RATELIMIT_1G_UNITS);

		}



		tc->pg = htons(pg[i]);

		tc->bw_precentage = htons(tc_tx_bw[i]);



		tc->max_bw_units = htons(MLX4_RATELIMIT_UNITS);

		tc->max_bw_value = htons(r);

	}



	in_mod = MLX4_SET_PORT_SCHEDULER << 8 | port;

include/linux/mlx4/device.h

+11 −0
Original line number Diff line number Diff line
@@ -48,6 +48,17 @@ 
#define MSIX_LEGACY_SZ		4

#define MIN_MSIX_P_PORT		5



#define MLX4_NUM_UP			8

#define MLX4_NUM_TC			8

#define MLX4_MAX_100M_UNITS_VAL		255	/*

						 * work around: can't set values

						 * greater then this value when

						 * using 100 Mbps units.

						 */

#define MLX4_RATELIMIT_100M_UNITS	3	/* 100 Mbps */

#define MLX4_RATELIMIT_1G_UNITS		4	/* 1 Gbps */

#define MLX4_RATELIMIT_DEFAULT		0x00ff



#define MLX4_ROCE_MAX_GIDS	128

#define MLX4_ROCE_PF_GIDS	16