svn commit: r358885 - in stable/12/sys/dev/mlx5: . mlx5_en mlx5_ib
Konstantin Belousov
kib at FreeBSD.org
Wed Mar 11 08:51:21 UTC 2020
Author: kib
Date: Wed Mar 11 08:51:19 2020
New Revision: 358885
URL: https://svnweb.freebsd.org/changeset/base/358885
Log:
MFC r358624:
mlx5en: Support 50GBase-KR4 media type in mlx5en driver.
Sponsored by: Mellanox Technologies
Modified:
stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
stable/12/sys/dev/mlx5/port.h
Directory Properties:
stable/12/ (props changed)
Modified: stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Wed Mar 11 08:34:29 2020 (r358884)
+++ stable/12/sys/dev/mlx5/mlx5_en/mlx5_en_main.c Wed Mar 11 08:51:19 2020 (r358885)
@@ -166,6 +166,10 @@ static const struct media mlx5e_mode_table[MLX5E_LINK_
.subtype = IFM_50G_KR2,
.baudrate = IF_Gbps(50ULL),
},
+ [MLX5E_50GBASE_KR4][MLX5E_KR4] = {
+ .subtype = IFM_50G_KR4,
+ .baudrate = IF_Gbps(50ULL),
+ },
};
static const struct media mlx5e_ext_mode_table[MLX5E_EXT_LINK_SPEEDS_NUMBER][MLX5E_LINK_MODES_NUMBER] = {
@@ -312,6 +316,10 @@ static const struct media mlx5e_ext_mode_table[MLX5E_E
},
[MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2][MLX5E_KR2] = {
.subtype = IFM_50G_KR2,
+ .baudrate = IF_Gbps(50ULL),
+ },
+ [MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2][MLX5E_KR4] = {
+ .subtype = IFM_50G_KR4,
.baudrate = IF_Gbps(50ULL),
},
[MLX5E_50GAUI_2_LAUI_2_50GBASE_CR2_KR2][MLX5E_SR2] = {
Modified: stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c
==============================================================================
--- stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c Wed Mar 11 08:34:29 2020 (r358884)
+++ stable/12/sys/dev/mlx5/mlx5_ib/mlx5_ib_main.c Wed Mar 11 08:51:19 2020 (r358885)
@@ -199,6 +199,7 @@ static int translate_eth_proto_oper(u32 eth_proto_oper
break;
case MLX5E_PROT_MASK(MLX5E_50GBASE_CR2):
case MLX5E_PROT_MASK(MLX5E_50GBASE_KR2):
+ case MLX5E_PROT_MASK(MLX5E_50GBASE_KR4):
case MLX5E_PROT_MASK(MLX5E_50GBASE_SR2):
*active_width = IB_WIDTH_1X;
*active_speed = IB_SPEED_HDR;
Modified: stable/12/sys/dev/mlx5/port.h
==============================================================================
--- stable/12/sys/dev/mlx5/port.h Wed Mar 11 08:34:29 2020 (r358884)
+++ stable/12/sys/dev/mlx5/port.h Wed Mar 11 08:51:19 2020 (r358885)
@@ -95,6 +95,7 @@ enum mlx5e_link_speed {
MLX5E_40GBASE_SR4 = 15,
MLX5E_40GBASE_LR4_ER4 = 16,
MLX5E_50GBASE_SR2 = 18,
+ MLX5E_50GBASE_KR4 = 19,
MLX5E_100GBASE_CR4 = 20,
MLX5E_100GBASE_SR4 = 21,
MLX5E_100GBASE_KR4 = 22,
More information about the svn-src-stable-12
mailing list