Commit 514bd654 authored by Patrisious Haddad's avatar Patrisious Haddad Committed by Wen Zhiwei
Browse files

IB/mlx5: Rename 400G_8X speed to comply to naming convention 

stable inclusion
from stable-v6.6.52
commit 4ce59074d53ca12dfefd7221149401d426b31994
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/IAYXOD

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=4ce59074d53ca12dfefd7221149401d426b31994



--------------------------------

[ Upstream commit b28ad32442bec2f0d9cb660d7d698a1a53c13d08 ]

Rename 400G_8X speed to comply to naming convention.

Signed-off-by: default avatarPatrisious Haddad <phaddad@nvidia.com>
Reviewed-by: default avatarMark Zhang <markzhang@nvidia.com>
Link: https://lore.kernel.org/r/ac98447cac8379a43fbdb36d56e5fb2b741a97ff.1695204156.git.leon@kernel.org


Reviewed-by: default avatarJacob Keller <jacob.e.keller@intel.com>
Signed-off-by: default avatarLeon Romanovsky <leon@kernel.org>
Stable-dep-of: 80bf474242b2 ("net/mlx5e: Add missing link mode to ptys2ext_ethtool_map")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
Signed-off-by: default avatarWen Zhiwei <wenzhiwei@kylinos.cn>
parent 7c476e54

drivers/infiniband/hw/mlx5/main.c

+1 −1
Original line number Diff line number Diff line
@@ -444,7 +444,7 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u16 *active_speed, 
		*active_width = IB_WIDTH_2X;

		*active_speed = IB_SPEED_NDR;

		break;

	case MLX5E_PROT_MASK(MLX5E_400GAUI_8):

	case MLX5E_PROT_MASK(MLX5E_400GAUI_8_400GBASE_CR8):

		*active_width = IB_WIDTH_8X;

		*active_speed = IB_SPEED_HDR;

		break;

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

+1 −1
Original line number Diff line number Diff line
@@ -1098,7 +1098,7 @@ static const u32 mlx5e_ext_link_speed[MLX5E_EXT_LINK_MODES_NUMBER] = { 
	[MLX5E_CAUI_4_100GBASE_CR4_KR4] = 100000,

	[MLX5E_100GAUI_2_100GBASE_CR2_KR2] = 100000,

	[MLX5E_200GAUI_4_200GBASE_CR4_KR4] = 200000,

	[MLX5E_400GAUI_8] = 400000,

	[MLX5E_400GAUI_8_400GBASE_CR8] = 400000,

	[MLX5E_100GAUI_1_100GBASE_CR_KR] = 100000,

	[MLX5E_200GAUI_2_200GBASE_CR2_KR2] = 200000,

	[MLX5E_400GAUI_4_400GBASE_CR4_KR4] = 400000,

include/linux/mlx5/port.h

+1 −1
Original line number Diff line number Diff line
@@ -115,7 +115,7 @@ enum mlx5e_ext_link_mode { 
	MLX5E_100GAUI_1_100GBASE_CR_KR		= 11,

	MLX5E_200GAUI_4_200GBASE_CR4_KR4	= 12,

	MLX5E_200GAUI_2_200GBASE_CR2_KR2	= 13,

	MLX5E_400GAUI_8				= 15,

	MLX5E_400GAUI_8_400GBASE_CR8		= 15,

	MLX5E_400GAUI_4_400GBASE_CR4_KR4	= 16,

	MLX5E_EXT_LINK_MODES_NUMBER,

};