Commit 87a5112b authored by Gal Pressman's avatar Gal Pressman Committed by Jakub Kicinski
Browse files

net/mlx5e: Use standard unit definitions for bandwidth conversion 



MLX5E_100MB and MLX5E_1GB defines are confusing, MLX5E_100MB is not
equal to 100 * MEGA, and MLX5E_1GB is not equal to one GIGA, as they
hide the Kbps rate conversion required for ieee_maxrate.

Replace hardcoded bandwidth conversion values with standard unit
definitions from linux/units.h. Rename MLX5E_100MB/MLX5E_1GB to
MLX5E_100MB_TO_KB/MLX5E_1GB_TO_KB to clarify these are conversion
factors to Kbps, not absolute bandwidth values.

Signed-off-by: default avatarGal Pressman <gal@nvidia.com>
Reviewed-by: default avatarNimrod Oren <noren@nvidia.com>
Signed-off-by: default avatarTariq Toukan <tariqt@nvidia.com>
Link: https://patch.msgid.link/1764498334-1327918-5-git-send-email-tariqt@nvidia.com


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent 53f7a771

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

+9 −8
Original line number Diff line number Diff line
@@ -31,14 +31,15 @@ 
 */

#include <linux/device.h>

#include <linux/netdevice.h>

#include <linux/units.h>

#include "en.h"

#include "en/port.h"

#include "en/port_buffer.h"



#define MLX5E_MAX_BW_ALLOC 100 /* Max percentage of BW allocation */



#define MLX5E_100MB (100000)

#define MLX5E_1GB   (1000000)

#define MLX5E_100MB_TO_KB (100 * MEGA / KILO)

#define MLX5E_1GB_TO_KB   (GIGA / KILO)



#define MLX5E_CEE_STATE_UP    1

#define MLX5E_CEE_STATE_DOWN  0
@@ -572,10 +573,10 @@ static int mlx5e_dcbnl_ieee_getmaxrate(struct net_device *netdev, 
	for (i = 0; i <= mlx5_max_tc(mdev); i++) {

		switch (max_bw_unit[i]) {

		case MLX5_100_MBPS_UNIT:

			maxrate->tc_maxrate[i] = max_bw_value[i] * MLX5E_100MB;

			maxrate->tc_maxrate[i] = max_bw_value[i] * MLX5E_100MB_TO_KB;

			break;

		case MLX5_GBPS_UNIT:

			maxrate->tc_maxrate[i] = max_bw_value[i] * MLX5E_1GB;

			maxrate->tc_maxrate[i] = max_bw_value[i] * MLX5E_1GB_TO_KB;

			break;

		case MLX5_BW_NO_LIMIT:

			break;
@@ -614,8 +615,8 @@ static int mlx5e_dcbnl_ieee_setmaxrate(struct net_device *netdev, 


	memset(max_bw_value, 0, sizeof(max_bw_value));

	memset(max_bw_unit, 0, sizeof(max_bw_unit));

	upper_limit_100mbps = U8_MAX * MLX5E_100MB;

	upper_limit_gbps = U8_MAX * MLX5E_1GB;

	upper_limit_100mbps = U8_MAX * MLX5E_100MB_TO_KB;

	upper_limit_gbps = U8_MAX * MLX5E_1GB_TO_KB;



	for (i = 0; i <= mlx5_max_tc(mdev); i++) {

		if (!maxrate->tc_maxrate[i]) {
@@ -624,12 +625,12 @@ static int mlx5e_dcbnl_ieee_setmaxrate(struct net_device *netdev, 
		}

		if (maxrate->tc_maxrate[i] <= upper_limit_100mbps) {

			max_bw_value[i] = div_u64(maxrate->tc_maxrate[i],

						  MLX5E_100MB);

						  MLX5E_100MB_TO_KB);

			max_bw_value[i] = max_bw_value[i] ? max_bw_value[i] : 1;

			max_bw_unit[i]  = MLX5_100_MBPS_UNIT;

		} else if (maxrate->tc_maxrate[i] <= upper_limit_gbps) {

			max_bw_value[i] = div_u64(maxrate->tc_maxrate[i],

						  MLX5E_1GB);

						  MLX5E_1GB_TO_KB);

			max_bw_unit[i]  = MLX5_GBPS_UNIT;

		} else {

			netdev_err(netdev,