Skip to content

Commit 215b530

Browse files
Yael Chemlakuba-moo
authored andcommitted
net/mlx5: Fix 1600G link mode enum naming
Rename TAUI/TBASE to GAUI/GBASE in 1600G link mode identifier and its usage in ethtool and link-info tables. Reported-by: Dawid Osuchowski <dawid.osuchowski@linux.intel.com> Signed-off-by: Yael Chemla <ychemla@nvidia.com> Reviewed-by: Shahar Shitrit <shshitrit@nvidia.com> Signed-off-by: Tariq Toukan <tariqt@nvidia.com> Reviewed-by: Jacob Keller <jacob.e.keller@intel.com> Reviewed-by: Dawid Osuchowski <dawid.osuchowski@linux.intel.com> Reported-by: Dawid Osuchowski <dawid.osuchowski@linux.intel.com> Signed-off-by: Yael Chemla <ychemla@nvidia.com> Reviewed-by: Leon Romanovsky <leonro@nvidia.com> Link: https://patch.msgid.link/20260204194324.1723534-1-tariqt@nvidia.com Signed-off-by: Jakub Kicinski <kuba@kernel.org>
1 parent a182a62 commit 215b530

4 files changed

Lines changed: 4 additions & 4 deletions

File tree

drivers/infiniband/hw/mlx5/main.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -511,7 +511,7 @@ static int translate_eth_ext_proto_oper(u32 eth_proto_oper, u16 *active_speed,
511511
*active_width = IB_WIDTH_4X;
512512
*active_speed = IB_SPEED_XDR;
513513
break;
514-
case MLX5E_PROT_MASK(MLX5E_1600TAUI_8_1600TBASE_CR8_KR8):
514+
case MLX5E_PROT_MASK(MLX5E_1600GAUI_8_1600GBASE_CR8_KR8):
515515
*active_width = IB_WIDTH_8X;
516516
*active_speed = IB_SPEED_XDR;
517517
break;

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -261,7 +261,7 @@ void mlx5e_build_ptys2ethtool_map(void)
261261
ETHTOOL_LINK_MODE_800000baseDR4_2_Full_BIT,
262262
ETHTOOL_LINK_MODE_800000baseSR4_Full_BIT,
263263
ETHTOOL_LINK_MODE_800000baseVR4_Full_BIT);
264-
MLX5_BUILD_PTYS2ETHTOOL_CONFIG(MLX5E_1600TAUI_8_1600TBASE_CR8_KR8, ext,
264+
MLX5_BUILD_PTYS2ETHTOOL_CONFIG(MLX5E_1600GAUI_8_1600GBASE_CR8_KR8, ext,
265265
ETHTOOL_LINK_MODE_1600000baseCR8_Full_BIT,
266266
ETHTOOL_LINK_MODE_1600000baseKR8_Full_BIT,
267267
ETHTOOL_LINK_MODE_1600000baseDR8_Full_BIT,

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

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1111,7 +1111,7 @@ mlx5e_ext_link_info[MLX5E_EXT_LINK_MODES_NUMBER] = {
11111111
[MLX5E_200GAUI_1_200GBASE_CR1_KR1] = {.speed = 200000, .lanes = 1},
11121112
[MLX5E_400GAUI_2_400GBASE_CR2_KR2] = {.speed = 400000, .lanes = 2},
11131113
[MLX5E_800GAUI_4_800GBASE_CR4_KR4] = {.speed = 800000, .lanes = 4},
1114-
[MLX5E_1600TAUI_8_1600TBASE_CR8_KR8] = {.speed = 1600000, .lanes = 8},
1114+
[MLX5E_1600GAUI_8_1600GBASE_CR8_KR8] = {.speed = 1600000, .lanes = 8},
11151115
};
11161116

11171117
int mlx5_port_query_eth_proto(struct mlx5_core_dev *dev, u8 port, bool ext,

include/linux/mlx5/port.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -112,7 +112,7 @@ enum mlx5e_ext_link_mode {
112112
MLX5E_400GAUI_2_400GBASE_CR2_KR2 = 17,
113113
MLX5E_800GAUI_8_800GBASE_CR8_KR8 = 19,
114114
MLX5E_800GAUI_4_800GBASE_CR4_KR4 = 20,
115-
MLX5E_1600TAUI_8_1600TBASE_CR8_KR8 = 23,
115+
MLX5E_1600GAUI_8_1600GBASE_CR8_KR8 = 23,
116116
MLX5E_EXT_LINK_MODES_NUMBER,
117117
};
118118

0 commit comments

Comments
 (0)