Add missing 400000base modes for dump_link_caps
Subsystems (2)
PATCH v3 1/3 Add missing 400000base modes for dump_link_caps
Commit 63130d0b00040 ("update link mode tables") missed adding in the 400000base link_caps to the array.
--- ethtool.c | 10 ++++++++++ 1 file changed, 10 insertions(+)
ethtool.c +10 -0
@@ -659,6 +659,16 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, "200000baseDR4/Full" }, {0 , ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT, "200000baseCR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT, + "400000baseKR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT, + "400000baseSR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT, + "400000baseLR4_ER4_FR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT, + "400000baseDR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, + "400000baseCR4/Full" }, };int indent;int did1, new_line_pend;
Signature · 1 line
2.28.0.585.ge1cfff676549
PATCH v3 2/3 update UAPI header copies
Update to kernel commit 55f13311785c
--- uapi/linux/ethtool.h | 2 ++ uapi/linux/ethtool_netlink.h | 19 ++++++++++++++++++- 2 files changed, 20 insertions(+), 1 deletion(-)
uapi/linux/ethtool.h +2 -0
@@ -1615,6 +1615,8 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT =87 , ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT =88 , ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT =89 , + ETHTOOL_LINK_MODE_100baseFX_Half_BIT =90 , + ETHTOOL_LINK_MODE_100baseFX_Full_BIT =91 ,/* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS };
uapi/linux/ethtool_netlink.h +18 -1
@@ -79,6 +79,7 @@ enum {ETHTOOL_MSG_TSINFO_GET_REPLY ,ETHTOOL_MSG_CABLE_TEST_NTF ,ETHTOOL_MSG_CABLE_TEST_TDR_NTF , +ETHTOOL_MSG_TUNNEL_INFO_GET_REPLY ,/* add new constants above here */ __ETHTOOL_MSG_KERNEL_CNT,
@@ -91,9 +92,12 @@ enum {#define ETHTOOL_FLAG_COMPACT_BITSETS (1 << 0)/* provide optional reply for SET or ACT requests */ #define ETHTOOL_FLAG_OMIT_REPLY (1 << 1) +/* request statistics, if supported by the driver */ +#define ETHTOOL_FLAG_STATS (1 << 2)#define ETHTOOL_FLAG_ALL (ETHTOOL_FLAG_COMPACT_BITSETS | \ - ETHTOOL_FLAG_OMIT_REPLY) + ETHTOOL_FLAG_OMIT_REPLY | \ + ETHTOOL_FLAG_STATS)enum {ETHTOOL_A_HEADER_UNSPEC ,
@@ -376,12 +380,25 @@ enum {ETHTOOL_A_PAUSE_AUTONEG ,/* u8 */ ETHTOOL_A_PAUSE_RX ,/* u8 */ ETHTOOL_A_PAUSE_TX ,/* u8 */ +ETHTOOL_A_PAUSE_STATS ,/* nest - _PAUSE_STAT_* */ /* add new constants above here */ __ETHTOOL_A_PAUSE_CNT,ETHTOOL_A_PAUSE_MAX = (__ETHTOOL_A_PAUSE_CNT -1 ) }; +enum { +ETHTOOL_A_PAUSE_STAT_UNSPEC , +ETHTOOL_A_PAUSE_STAT_PAD , + +ETHTOOL_A_PAUSE_STAT_TX_FRAMES , +ETHTOOL_A_PAUSE_STAT_RX_FRAMES , + +/* add new constants above here */ + __ETHTOOL_A_PAUSE_STAT_CNT, +ETHTOOL_A_PAUSE_STAT_MAX = (__ETHTOOL_A_PAUSE_STAT_CNT -1 ) +}; +/* EEE */ enum {
Signature · 1 line
2.28.0.585.ge1cfff676549
PATCH v3 3/3 Update link mode tables for fiber
In reply to Dan MurphyUpdate the link mode tables to include 100base Fx Full and Half duplex modes.
--- ethtool.8.in | 2 ++ ethtool.c | 6 ++++++ netlink/settings.c | 2 ++ 3 files changed, 10 insertions(+)
ethtool.8.in +2 -0
@@ -794,6 +794,8 @@ lB l lB. 0x8000000000000000000000 400000baseLR4_ER4_FR4 Full 0x10000000000000000000000 400000baseDR4 Full 0x20000000000000000000000 400000baseCR4 Full +0x40000000000000000000000 100baseFX Half +0x80000000000000000000000 100baseFX Full .TE .TP .BI phyad \ N
ethtool.c +6 -0
@@ -463,6 +463,8 @@ static void init_global_link_mode_masks(void) ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT, ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT, ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, + ETHTOOL_LINK_MODE_100baseFX_Half_BIT, + ETHTOOL_LINK_MODE_100baseFX_Full_BIT, };static const enum ethtool_link_mode_bit_indices additional_advertised_flags_bits[] = {
@@ -669,6 +671,10 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, "400000baseDR4/Full" }, {0 , ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, "400000baseCR4/Full" }, + { 0, ETHTOOL_LINK_MODE_100baseFX_Half_BIT, + "100baseFx/Half" }, + { 1, ETHTOOL_LINK_MODE_100baseFX_Full_BIT, + "100baseFx/Full" }, };int indent;int did1, new_line_pend;
netlink/settings.c +2 -0
@@ -162,6 +162,8 @@ static const struct link_mode_info link_modes[] = { [ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT] = __REAL(400000), [ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT] = __REAL(400000), [ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT] = __REAL(400000), + [ETHTOOL_LINK_MODE_100baseFX_Half_BIT] = __HALF_DUPLEX(100), + [ETHTOOL_LINK_MODE_100baseFX_Full_BIT] = __REAL(100), };const unsigned int link_modes_count =ARRAY_SIZE (link_modes);
Signature · 1 line
2.28.0.585.ge1cfff676549
Quoted 5 lines · Dan Murphy
Commit
63130d0b00040("update link mode tables") missed adding in the 400000baselink_capsto the array.Signed-off-by Dan Murphy <[email protected]>---
I'm sorry, I only found these patches shortly after I pushed similar update as I needed updated UAPI headers for new format descriptions.
Michal
Quoted 27 lines
ethtool.c | 10 ++++++++++ 1 file changed, 10 insertions(+)ethtool.c +10
-0@@ -659,6 +659,16 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, "200000baseDR4/Full" }, {0 , ETHTOOL_LINK_MODE_200000baseCR4_Full_BIT, "200000baseCR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseKR4_Full_BIT, + "400000baseKR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseSR4_Full_BIT, + "400000baseSR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseLR4_ER4_FR4_Full_BIT, + "400000baseLR4_ER4_FR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseDR4_Full_BIT, + "400000baseDR4/Full" }, + { 0, ETHTOOL_LINK_MODE_400000baseCR4_Full_BIT, + "400000baseCR4/Full" }, };int indent;int did1, new_line_pend;Signature · 1 line
2.28.0.585.ge1cfff676549
Michal
Quoted 8 lines · Michal Kubecek
Quoted 5 lines · Dan Murphy
Commit
63130d0b00040("update link mode tables") missed adding in the 400000baselink_capsto the array.Signed-off-by Dan Murphy <[email protected]>---
I'm sorry, I only found these patches shortly after I pushed similar update as I needed updated UAPI headers for new format descriptions.
Is there an action I need to take here?
Quoted 7 lines · Dan Murphy
Michal
Quoted 4 lines · Michal Kubecek
Quoted 3 lines · Dan Murphy
Commit
63130d0b00040("update link mode tables") missed adding in the 400000baselink_capsto the array.
Quoted 6 lines
Quoted 4 lines
Quoted 2 lines
Signed-off-by Dan Murphy <[email protected]>---
I'm sorry, I only found these patches shortly after I pushed similar update as I needed updated UAPI headers for new format descriptions.
Is there an action I need to take here?
I don't think so, I believe I have everything that was in your patches (with minor diffrences) but you may want to check.
Michal