svn commit: r338208 - head/sys/net
Eric Joyner
erj at FreeBSD.org
Wed Aug 22 18:19:58 UTC 2018
Author: erj
Date: Wed Aug 22 18:19:56 2018
New Revision: 338208
URL: https://svnweb.freebsd.org/changeset/base/338208
Log:
if_media: Add new 2.5G/5G/25G/40G/50G/100G/200G/400G media types
Upcoming Ethernet hardware will support new media types that aren't in the kernel
yet, so they are added here. These mostly include new 25G/50G/100G media types;
and this commit introduces new 200G/400G speeds and media.
Reviewed by: hselasky@, jhb@
MFC after: 1 week
Sponsored by: Intel Corporation
Differential Revision: https://reviews.freebsd.org/D16731
Modified:
head/sys/net/ieee8023ad_lacp.c
head/sys/net/if_media.h
Modified: head/sys/net/ieee8023ad_lacp.c
==============================================================================
--- head/sys/net/ieee8023ad_lacp.c Wed Aug 22 17:36:27 2018 (r338207)
+++ head/sys/net/ieee8023ad_lacp.c Wed Aug 22 18:19:56 2018 (r338208)
@@ -1109,6 +1109,7 @@ lacp_compose_key(struct lacp_port *lp)
case IFM_100_VG:
case IFM_100_T2:
case IFM_100_T:
+ case IFM_100_SGMII:
key = IFM_100_TX;
break;
case IFM_1000_SX:
@@ -1140,14 +1141,31 @@ lacp_compose_key(struct lacp_port *lp)
break;
case IFM_2500_KX:
case IFM_2500_T:
+ case IFM_2500_X:
key = IFM_2500_KX;
break;
case IFM_5000_T:
+ case IFM_5000_KR:
+ case IFM_5000_KR_S:
+ case IFM_5000_KR1:
key = IFM_5000_T;
break;
case IFM_50G_PCIE:
case IFM_50G_CR2:
case IFM_50G_KR2:
+ case IFM_50G_SR2:
+ case IFM_50G_LR2:
+ case IFM_50G_LAUI2_AC:
+ case IFM_50G_LAUI2:
+ case IFM_50G_AUI2_AC:
+ case IFM_50G_AUI2:
+ case IFM_50G_CP:
+ case IFM_50G_SR:
+ case IFM_50G_LR:
+ case IFM_50G_FR:
+ case IFM_50G_KR_PAM4:
+ case IFM_50G_AUI1_AC:
+ case IFM_50G_AUI1:
key = IFM_50G_PCIE;
break;
case IFM_56G_R4:
@@ -1160,6 +1178,12 @@ lacp_compose_key(struct lacp_port *lp)
case IFM_25G_LR:
case IFM_25G_ACC:
case IFM_25G_AOC:
+ case IFM_25G_T:
+ case IFM_25G_CR_S:
+ case IFM_25G_CR1:
+ case IFM_25G_KR_S:
+ case IFM_25G_AUI:
+ case IFM_25G_KR1:
key = IFM_25G_PCIE;
break;
case IFM_40G_CR4:
@@ -1167,13 +1191,49 @@ lacp_compose_key(struct lacp_port *lp)
case IFM_40G_LR4:
case IFM_40G_XLPPI:
case IFM_40G_KR4:
+ case IFM_40G_XLAUI:
+ case IFM_40G_XLAUI_AC:
+ case IFM_40G_ER4:
key = IFM_40G_CR4;
break;
case IFM_100G_CR4:
case IFM_100G_SR4:
case IFM_100G_KR4:
case IFM_100G_LR4:
+ case IFM_100G_CAUI4_AC:
+ case IFM_100G_CAUI4:
+ case IFM_100G_AUI4_AC:
+ case IFM_100G_AUI4:
+ case IFM_100G_CR_PAM4:
+ case IFM_100G_KR_PAM4:
+ case IFM_100G_CP2:
+ case IFM_100G_SR2:
+ case IFM_100G_DR:
+ case IFM_100G_KR2_PAM4:
+ case IFM_100G_CAUI2_AC:
+ case IFM_100G_CAUI2:
+ case IFM_100G_AUI2_AC:
+ case IFM_100G_AUI2:
key = IFM_100G_CR4;
+ break;
+ case IFM_200G_CR4_PAM4:
+ case IFM_200G_SR4:
+ case IFM_200G_FR4:
+ case IFM_200G_LR4:
+ case IFM_200G_DR4:
+ case IFM_200G_KR4_PAM4:
+ case IFM_200G_AUI4_AC:
+ case IFM_200G_AUI4:
+ case IFM_200G_AUI8_AC:
+ case IFM_200G_AUI8:
+ key = IFM_200G_CR4_PAM4;
+ break;
+ case IFM_400G_FR8:
+ case IFM_400G_LR8:
+ case IFM_400G_DR4:
+ case IFM_400G_AUI8_AC:
+ case IFM_400G_AUI8:
+ key = IFM_400G_FR8;
break;
default:
key = subtype;
Modified: head/sys/net/if_media.h
==============================================================================
--- head/sys/net/if_media.h Wed Aug 22 17:36:27 2018 (r338207)
+++ head/sys/net/if_media.h Wed Aug 22 18:19:56 2018 (r338208)
@@ -202,6 +202,62 @@ uint64_t ifmedia_baudrate(int);
#define IFM_10G_AOC IFM_X(59) /* 10G active optical cable */
#define IFM_25G_ACC IFM_X(60) /* 25G active copper cable */
#define IFM_25G_AOC IFM_X(61) /* 25G active optical cable */
+#define IFM_100_SGMII IFM_X(62) /* 100M media interface */
+#define IFM_2500_X IFM_X(63) /* 2500BaseX */
+#define IFM_5000_KR IFM_X(64) /* 5GBase-KR backplane */
+#define IFM_25G_T IFM_X(65) /* 25GBase-T - RJ45 */
+#define IFM_25G_CR_S IFM_X(66) /* 25GBase-CR (short) */
+#define IFM_25G_CR1 IFM_X(67) /* 25GBase-CR1 DA cable */
+#define IFM_25G_KR_S IFM_X(68) /* 25GBase-KR (short) */
+#define IFM_5000_KR_S IFM_X(69) /* 5GBase-KR backplane (short) */
+#define IFM_5000_KR1 IFM_X(70) /* 5GBase-KR backplane */
+#define IFM_25G_AUI IFM_X(71) /* 25G-AUI-C2C (chip to chip) */
+#define IFM_40G_XLAUI IFM_X(72) /* 40G-XLAUI */
+#define IFM_40G_XLAUI_AC IFM_X(73) /* 40G active copper/optical */
+#define IFM_40G_ER4 IFM_X(74) /* 40GBase-ER4 */
+#define IFM_50G_SR2 IFM_X(75) /* 50GBase-SR2 */
+#define IFM_50G_LR2 IFM_X(76) /* 50GBase-LR2 */
+#define IFM_50G_LAUI2_AC IFM_X(77) /* 50G active copper/optical */
+#define IFM_50G_LAUI2 IFM_X(78) /* 50G-LAUI2 */
+#define IFM_50G_AUI2_AC IFM_X(79) /* 50G active copper/optical */
+#define IFM_50G_AUI2 IFM_X(80) /* 50G-AUI2 */
+#define IFM_50G_CP IFM_X(81) /* 50GBase-CP */
+#define IFM_50G_SR IFM_X(82) /* 50GBase-SR */
+#define IFM_50G_LR IFM_X(83) /* 50GBase-LR */
+#define IFM_50G_FR IFM_X(84) /* 50GBase-FR */
+#define IFM_50G_KR_PAM4 IFM_X(85) /* 50GBase-KR PAM4 */
+#define IFM_25G_KR1 IFM_X(86) /* 25GBase-KR1 */
+#define IFM_50G_AUI1_AC IFM_X(87) /* 50G active copper/optical */
+#define IFM_50G_AUI1 IFM_X(88) /* 50G-AUI1 */
+#define IFM_100G_CAUI4_AC IFM_X(89) /* 100G-CAUI4 active copper/optical */
+#define IFM_100G_CAUI4 IFM_X(90) /* 100G-CAUI4 */
+#define IFM_100G_AUI4_AC IFM_X(91) /* 100G-AUI4 active copper/optical */
+#define IFM_100G_AUI4 IFM_X(92) /* 100G-AUI4 */
+#define IFM_100G_CR_PAM4 IFM_X(93) /* 100GBase-CR PAM4 */
+#define IFM_100G_KR_PAM4 IFM_X(94) /* 100GBase-CR PAM4 */
+#define IFM_100G_CP2 IFM_X(95) /* 100GBase-CP2 */
+#define IFM_100G_SR2 IFM_X(96) /* 100GBase-SR2 */
+#define IFM_100G_DR IFM_X(97) /* 100GBase-DR */
+#define IFM_100G_KR2_PAM4 IFM_X(98) /* 100GBase-KR2 PAM4 */
+#define IFM_100G_CAUI2_AC IFM_X(99) /* 100G-CAUI2 active copper/optical */
+#define IFM_100G_CAUI2 IFM_X(100) /* 100G-CAUI2 */
+#define IFM_100G_AUI2_AC IFM_X(101) /* 100G-AUI2 active copper/optical */
+#define IFM_100G_AUI2 IFM_X(102) /* 100G-AUI2 */
+#define IFM_200G_CR4_PAM4 IFM_X(103) /* 200GBase-CR4 PAM4 */
+#define IFM_200G_SR4 IFM_X(104) /* 200GBase-SR4 */
+#define IFM_200G_FR4 IFM_X(105) /* 200GBase-FR4 */
+#define IFM_200G_LR4 IFM_X(106) /* 200GBase-LR4 */
+#define IFM_200G_DR4 IFM_X(107) /* 200GBase-DR4 */
+#define IFM_200G_KR4_PAM4 IFM_X(108) /* 200GBase-KR4 PAM4 */
+#define IFM_200G_AUI4_AC IFM_X(109) /* 200G-AUI4 active copper/optical */
+#define IFM_200G_AUI4 IFM_X(110) /* 200G-AUI4 */
+#define IFM_200G_AUI8_AC IFM_X(111) /* 200G-AUI8 active copper/optical */
+#define IFM_200G_AUI8 IFM_X(112) /* 200G-AUI8 */
+#define IFM_400G_FR8 IFM_X(113) /* 400GBase-FR8 */
+#define IFM_400G_LR8 IFM_X(114) /* 400GBase-LR8 */
+#define IFM_400G_DR4 IFM_X(115) /* 400GBase-DR4 */
+#define IFM_400G_AUI8_AC IFM_X(116) /* 400G-AUI8 active copper/optical */
+#define IFM_400G_AUI8 IFM_X(117) /* 400G-AUI8 */
/*
* Please update ieee8023ad_lacp.c:lacp_compose_key()
@@ -432,6 +488,62 @@ struct ifmedia_description {
{ IFM_10G_AOC, "10GBase-AOC" }, \
{ IFM_25G_ACC, "25GBase-ACC" }, \
{ IFM_25G_AOC, "25GBase-AOC" }, \
+ { IFM_100_SGMII, "100M-SGMII" }, \
+ { IFM_2500_X, "2500Base-X" }, \
+ { IFM_5000_KR, "5000Base-KR" }, \
+ { IFM_25G_T, "25GBase-T" }, \
+ { IFM_25G_CR_S, "25GBase-CR-S" }, \
+ { IFM_25G_CR1, "25GBase-CR1" }, \
+ { IFM_25G_KR_S, "25GBase-KR-S" }, \
+ { IFM_5000_KR_S, "5000Base-KR-S" }, \
+ { IFM_5000_KR1, "5000Base-KR1" }, \
+ { IFM_25G_AUI, "25G-AUI" }, \
+ { IFM_40G_XLAUI, "40G-XLAUI" }, \
+ { IFM_40G_XLAUI_AC, "40G-XLAUI-AC" }, \
+ { IFM_40G_ER4, "40GBase-ER4" }, \
+ { IFM_50G_SR2, "50GBase-SR2" }, \
+ { IFM_50G_LR2, "50GBase-LR2" }, \
+ { IFM_50G_LAUI2_AC, "50G-LAUI2-AC" }, \
+ { IFM_50G_LAUI2, "50G-LAUI2" }, \
+ { IFM_50G_AUI2_AC, "50G-AUI2-AC" }, \
+ { IFM_50G_AUI2, "50G-AUI2" }, \
+ { IFM_50G_CP, "50GBase-CP" }, \
+ { IFM_50G_SR, "50GBase-SR" }, \
+ { IFM_50G_LR, "50GBase-LR" }, \
+ { IFM_50G_FR, "50GBase-FR" }, \
+ { IFM_50G_KR_PAM4, "50GBase-KR-PAM4" }, \
+ { IFM_25G_KR1, "25GBase-KR1" }, \
+ { IFM_50G_AUI1_AC, "50G-AUI1-AC" }, \
+ { IFM_50G_AUI1, "50G-AUI1" }, \
+ { IFM_100G_CAUI4_AC, "100G-CAUI4-AC" }, \
+ { IFM_100G_CAUI4, "100G-CAUI4" }, \
+ { IFM_100G_AUI4_AC, "100G-AUI4-AC" }, \
+ { IFM_100G_AUI4, "100G-AUI4" }, \
+ { IFM_100G_CR_PAM4, "100GBase-CR-PAM4" }, \
+ { IFM_100G_KR_PAM4, "100GBase-KR-PAM4" }, \
+ { IFM_100G_CP2, "100GBase-CP2" }, \
+ { IFM_100G_SR2, "100GBase-SR2" }, \
+ { IFM_100G_DR, "100GBase-DR" }, \
+ { IFM_100G_KR2_PAM4, "100GBase-KR2-PAM4" }, \
+ { IFM_100G_CAUI2_AC, "100G-CAUI2-AC" }, \
+ { IFM_100G_CAUI2, "100G-CAUI2" }, \
+ { IFM_100G_AUI2_AC, "100G-AUI2-AC" }, \
+ { IFM_100G_AUI2, "100G-AUI2" }, \
+ { IFM_200G_CR4_PAM4, "200GBase-CR4-PAM4" }, \
+ { IFM_200G_SR4, "200GBase-SR4" }, \
+ { IFM_200G_FR4, "200GBase-FR4" }, \
+ { IFM_200G_LR4, "200GBase-LR4" }, \
+ { IFM_200G_DR4, "200GBase-DR4" }, \
+ { IFM_200G_KR4_PAM4, "200GBase-KR4-PAM4" }, \
+ { IFM_200G_AUI4_AC, "200G-AUI4-AC" }, \
+ { IFM_200G_AUI4, "200G-AUI4" }, \
+ { IFM_200G_AUI8_AC, "200G-AUI8-AC" }, \
+ { IFM_200G_AUI8, "200G-AUI8" }, \
+ { IFM_400G_FR8, "400GBase-FR8" }, \
+ { IFM_400G_LR8, "400GBase-LR8" }, \
+ { IFM_400G_DR4, "400GBase-DR4" }, \
+ { IFM_400G_AUI8_AC, "400G-AUI8-AC" }, \
+ { IFM_400G_AUI8, "400G-AUI8" }, \
{ 0, NULL }, \
}
@@ -719,6 +831,62 @@ struct ifmedia_baudrate {
{ IFM_ETHER | IFM_10G_AOC, IF_Gbps(10ULL) }, \
{ IFM_ETHER | IFM_25G_ACC, IF_Gbps(25ULL) }, \
{ IFM_ETHER | IFM_25G_AOC, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_100_SGMII, IF_Mbps(100) }, \
+ { IFM_ETHER | IFM_2500_X, IF_Mbps(2500ULL) }, \
+ { IFM_ETHER | IFM_5000_KR, IF_Mbps(5000ULL) }, \
+ { IFM_ETHER | IFM_25G_T, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_25G_CR_S, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_25G_CR1, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_25G_KR_S, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_5000_KR_S, IF_Mbps(5000ULL) }, \
+ { IFM_ETHER | IFM_5000_KR1, IF_Mbps(5000ULL) }, \
+ { IFM_ETHER | IFM_25G_AUI, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_40G_XLAUI, IF_Gbps(40ULL) }, \
+ { IFM_ETHER | IFM_40G_XLAUI_AC, IF_Gbps(40ULL) }, \
+ { IFM_ETHER | IFM_40G_ER4, IF_Gbps(40ULL) }, \
+ { IFM_ETHER | IFM_50G_SR2, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_LR2, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_LAUI2_AC, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_LAUI2, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_AUI2_AC, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_AUI2, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_CP, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_SR, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_LR, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_FR, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_KR_PAM4, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_25G_KR1, IF_Gbps(25ULL) }, \
+ { IFM_ETHER | IFM_50G_AUI1_AC, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_50G_AUI1, IF_Gbps(50ULL) }, \
+ { IFM_ETHER | IFM_100G_CAUI4_AC, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_CAUI4, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_AUI4_AC, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_AUI4, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_CR_PAM4, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_KR_PAM4, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_CP2, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_SR2, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_DR, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_KR2_PAM4, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_CAUI2_AC, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_CAUI2, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_AUI2_AC, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_100G_AUI2, IF_Gbps(100ULL) }, \
+ { IFM_ETHER | IFM_200G_CR4_PAM4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_SR4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_FR4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_LR4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_DR4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_KR4_PAM4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_AUI4_AC, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_AUI4, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_AUI8_AC, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_200G_AUI8, IF_Gbps(200ULL) }, \
+ { IFM_ETHER | IFM_400G_FR8, IF_Gbps(400ULL) }, \
+ { IFM_ETHER | IFM_400G_LR8, IF_Gbps(400ULL) }, \
+ { IFM_ETHER | IFM_400G_DR4, IF_Gbps(400ULL) }, \
+ { IFM_ETHER | IFM_400G_AUI8_AC, IF_Gbps(400ULL) }, \
+ { IFM_ETHER | IFM_400G_AUI8, IF_Gbps(400ULL) }, \
\
{ IFM_IEEE80211 | IFM_IEEE80211_FH1, IF_Mbps(1) }, \
{ IFM_IEEE80211 | IFM_IEEE80211_FH2, IF_Mbps(2) }, \
More information about the svn-src-all
mailing list