diff options
author | Aya Levin <ayal@mellanox.com> | 2020-03-26 13:09:29 +0200 |
---|---|---|
committer | John W. Linville <linville@tuxdriver.com> | 2020-05-13 15:54:38 -0400 |
commit | 3bbe805ac6073c6c4ba18d7b64a0302e308c6186 (patch) | |
tree | aace57a71e5118c666e3490497d6718225193a6c | |
parent | 8dcdb3d22a66f18770e5566c0e72e86a0701aeac (diff) | |
download | ethtool-3bbe805ac6073c6c4ba18d7b64a0302e308c6186.tar.gz |
ethtool: Add support for Low Latency Reed Solomon
Introduce a new FEC mode LLRS: Low Latency Reed Solomon, update print
and initialization functions accordingly. In addition, update related
man page.
Signed-off-by: Aya Levin <ayal@mellanox.com>
Reviewed-by: Eran Ben Elisha <eranbe@mellanox.com>
Signed-off-by: Tariq Toukan <tariqt@mellanox.com>
Reviewed-by: Michal Kubecek <mkubecek@suse.cz>
Signed-off-by: John W. Linville <linville@tuxdriver.com>
-rw-r--r-- | ethtool.8.in | 5 | ||||
-rw-r--r-- | ethtool.c | 14 | ||||
-rw-r--r-- | netlink/settings.c | 2 | ||||
-rw-r--r-- | uapi/linux/ethtool.h | 3 |
4 files changed, 20 insertions, 4 deletions
diff --git a/ethtool.8.in b/ethtool.8.in index acc8d84..f8b09e0 100644 --- a/ethtool.8.in +++ b/ethtool.8.in @@ -420,7 +420,7 @@ ethtool \- query or control network driver and hardware settings .B ethtool \-\-set\-fec .I devname .B encoding -.BR auto | off | rs | baser \ [...] +.BR auto | off | rs | baser | llrs \ [...] .HP .B ethtool \-Q|\-\-per\-queue .I devname @@ -1228,7 +1228,7 @@ current FEC mode, the driver or firmware must take the link down administratively and report the problem in the system logs for users to correct. .RS 4 .TP -.BR encoding\ auto | off | rs | baser \ [...] +.BR encoding\ auto | off | rs | baser | llrs \ [...] Sets the FEC encoding for the device. Combinations of options are specified as e.g. @@ -1241,6 +1241,7 @@ auto Use the driver's default encoding off Turn off FEC RS Force RS-FEC encoding BaseR Force BaseR encoding +LLRS Force LLRS-FEC encoding .TE .RE .TP @@ -502,6 +502,7 @@ static void init_global_link_mode_masks(void) ETHTOOL_LINK_MODE_FEC_NONE_BIT, ETHTOOL_LINK_MODE_FEC_RS_BIT, ETHTOOL_LINK_MODE_FEC_BASER_BIT, + ETHTOOL_LINK_MODE_FEC_LLRS_BIT, }; unsigned int i; @@ -754,6 +755,12 @@ static void dump_link_caps(const char *prefix, const char *an_prefix, fprintf(stdout, " RS"); fecreported = 1; } + if (ethtool_link_mode_test_bit(ETHTOOL_LINK_MODE_FEC_LLRS_BIT, + mask)) { + fprintf(stdout, " LLRS"); + fecreported = 1; + } + if (!fecreported) fprintf(stdout, " Not reported"); fprintf(stdout, "\n"); @@ -1562,6 +1569,8 @@ static void dump_fec(u32 fec) fprintf(stdout, " BaseR"); if (fec & ETHTOOL_FEC_RS) fprintf(stdout, " RS"); + if (fec & ETHTOOL_FEC_LLRS) + fprintf(stdout, " LLRS"); } #define N_SOTS 7 @@ -5074,7 +5083,8 @@ static int fecmode_str_to_type(const char *str) return ETHTOOL_FEC_RS; if (!strcasecmp(str, "baser")) return ETHTOOL_FEC_BASER; - + if (!strcasecmp(str, "llrs")) + return ETHTOOL_FEC_LLRS; return 0; } @@ -5486,7 +5496,7 @@ static const struct option args[] = { .opts = "--set-fec", .func = do_sfec, .help = "Set FEC settings", - .xhelp = " [ encoding auto|off|rs|baser [...]]\n" + .xhelp = " [ encoding auto|off|rs|baser|llrs [...]]\n" }, { .opts = "-Q|--per-queue", diff --git a/netlink/settings.c b/netlink/settings.c index 0212465..472f8e3 100644 --- a/netlink/settings.c +++ b/netlink/settings.c @@ -207,6 +207,8 @@ static const struct link_mode_info link_modes[] = { { LM_CLASS_REAL, 400000, DUPLEX_FULL }, [ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT] = { LM_CLASS_REAL, 400000, DUPLEX_FULL }, + [ETHTOOL_LINK_MODE_FEC_LLRS_BIT] = + { LM_CLASS_FEC }, }; const unsigned int link_modes_count = ARRAY_SIZE(link_modes); diff --git a/uapi/linux/ethtool.h b/uapi/linux/ethtool.h index 1619806..d3dcb45 100644 --- a/uapi/linux/ethtool.h +++ b/uapi/linux/ethtool.h @@ -1328,6 +1328,7 @@ enum ethtool_fec_config_bits { ETHTOOL_FEC_OFF_BIT, ETHTOOL_FEC_RS_BIT, ETHTOOL_FEC_BASER_BIT, + ETHTOOL_FEC_LLRS_BIT, }; #define ETHTOOL_FEC_NONE (1 << ETHTOOL_FEC_NONE_BIT) @@ -1335,6 +1336,7 @@ enum ethtool_fec_config_bits { #define ETHTOOL_FEC_OFF (1 << ETHTOOL_FEC_OFF_BIT) #define ETHTOOL_FEC_RS (1 << ETHTOOL_FEC_RS_BIT) #define ETHTOOL_FEC_BASER (1 << ETHTOOL_FEC_BASER_BIT) +#define ETHTOOL_FEC_LLRS (1 << ETHTOOL_FEC_LLRS_BIT) /* CMDs currently supported */ #define ETHTOOL_GSET 0x00000001 /* DEPRECATED, Get settings. @@ -1519,6 +1521,7 @@ enum ethtool_link_mode_bit_indices { ETHTOOL_LINK_MODE_400000baseLR8_ER8_FR8_Full_BIT = 71, ETHTOOL_LINK_MODE_400000baseDR8_Full_BIT = 72, ETHTOOL_LINK_MODE_400000baseCR8_Full_BIT = 73, + ETHTOOL_LINK_MODE_FEC_LLRS_BIT = 74, /* must be last entry */ __ETHTOOL_LINK_MODE_MASK_NBITS |