From: Danielle Ratson <danieller@nvidia.com>
To: <netdev@vger.kernel.org>
Cc: <mkubecek@suse.cz>, <matt@traverse.com.au>,
<daniel.zahka@gmail.com>, <amcohen@nvidia.com>,
<nbu-mlxsw@exchange.nvidia.com>,
Danielle Ratson <danieller@nvidia.com>
Subject: [PATCH ethtool-next v3 02/16] ethtool: Standardize Link Length field names across module types
Date: Tue, 4 Feb 2025 15:39:43 +0200 [thread overview]
Message-ID: <20250204133957.1140677-3-danieller@nvidia.com> (raw)
In-Reply-To: <20250204133957.1140677-1-danieller@nvidia.com>
The 'Link Length' fields have inconsistent naming across different
module types.
To ensure consistency, especially with the upcoming JSON support for the
EEPROM dump, these field names should be aligned.
Standardize the Link Length fields across all module types.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
Notes:
v3:
* New patch.
cmis.c | 4 ++--
qsfp.c | 8 ++++----
sfpid.c | 11 ++++++-----
3 files changed, 12 insertions(+), 11 deletions(-)
diff --git a/cmis.c b/cmis.c
index 71f0745..5efafca 100644
--- a/cmis.c
+++ b/cmis.c
@@ -282,9 +282,9 @@ static void cmis_show_link_len(const struct cmis_memory_map *map)
module_show_value_with_unit(map->page_01h, CMIS_OM4_LEN_OFFSET,
"Length (OM4)", 2, "m");
module_show_value_with_unit(map->page_01h, CMIS_OM3_LEN_OFFSET,
- "Length (OM3 50/125um)", 2, "m");
+ "Length (OM3)", 2, "m");
module_show_value_with_unit(map->page_01h, CMIS_OM2_LEN_OFFSET,
- "Length (OM2 50/125um)", 1, "m");
+ "Length (OM2)", 1, "m");
}
/**
diff --git a/qsfp.c b/qsfp.c
index 6d774f8..1aa75fd 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -736,13 +736,13 @@ static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
"BR, Nominal", 100, "Mbps");
sff8636_show_rate_identifier(map);
module_show_value_with_unit(map->page_00h, SFF8636_SM_LEN_OFFSET,
- "Length (SMF,km)", 1, "km");
+ "Length (SMF)", 1, "km");
module_show_value_with_unit(map->page_00h, SFF8636_OM3_LEN_OFFSET,
- "Length (OM3 50um)", 2, "m");
+ "Length (OM3)", 2, "m");
module_show_value_with_unit(map->page_00h, SFF8636_OM2_LEN_OFFSET,
- "Length (OM2 50um)", 1, "m");
+ "Length (OM2)", 1, "m");
module_show_value_with_unit(map->page_00h, SFF8636_OM1_LEN_OFFSET,
- "Length (OM1 62.5um)", 1, "m");
+ "Length (OM1)", 1, "m");
module_show_value_with_unit(map->page_00h, SFF8636_CBL_LEN_OFFSET,
"Length (Copper or Active cable)", 1, "m");
sff8636_show_wavelength_or_copper_compliance(map);
diff --git a/sfpid.c b/sfpid.c
index 459ed0b..d128f48 100644
--- a/sfpid.c
+++ b/sfpid.c
@@ -395,11 +395,12 @@ static void sff8079_show_all_common(const __u8 *id)
sff8079_show_encoding(id);
printf("\t%-41s : %u%s\n", "BR, Nominal", br_nom, "MBd");
sff8079_show_rate_identifier(id);
- module_show_value_with_unit(id, 14, "Length (SMF,km)", 1, "km");
- module_show_value_with_unit(id, 15, "Length (SMF)", 100, "m");
- module_show_value_with_unit(id, 16, "Length (50um)", 10, "m");
- module_show_value_with_unit(id, 17, "Length (62.5um)", 10, "m");
- module_show_value_with_unit(id, 18, "Length (Copper)", 1, "m");
+ module_show_value_with_unit(id, 14, "Length (SMF)", 1, "km");
+ module_show_value_with_unit(id, 16, "Length (OM2)", 10, "m");
+ module_show_value_with_unit(id, 17, "Length (OM1)", 10, "m");
+ module_show_value_with_unit(id, 18,
+ "Length (Copper or Active cable)",
+ 1, "m");
module_show_value_with_unit(id, 19, "Length (OM3)", 10, "m");
sff8079_show_wavelength_or_copper_compliance(id);
module_show_ascii(id, 20, 35, "Vendor name");
--
2.47.0
next prev parent reply other threads:[~2025-02-04 13:40 UTC|newest]
Thread overview: 26+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-02-04 13:39 [PATCH ethtool-next v3 00/16] Add JSON output to --module-info Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 01/16] module_common: Add a new file to all the common code for all module types Danielle Ratson
2025-02-04 13:39 ` Danielle Ratson [this message]
2025-02-04 13:39 ` [PATCH ethtool-next v3 03/16] sff_common: Move sff_show_revision_compliance() to qsfp.c Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 04/16] cmis: Change loop order in cmis_show_dom_chan_lvl_flags() Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 05/16] qsfp: Reorder the channel-level flags list for SFF8636 module type Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 06/16] qsfp: Refactor sff8636_show_dom() by moving code into separate functions Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 07/16] module_common: Add helpers to support JSON printing for common value types Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 08/16] cmis: Add JSON output handling to --module-info in CMIS modules Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 09/16] cmis: Enable JSON output support " Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 10/16] qsfp: Add JSON output handling to --module-info in SFF8636 modules Danielle Ratson
2025-02-05 2:34 ` Jakub Kicinski
2025-02-05 7:45 ` Danielle Ratson
2025-02-05 10:48 ` Vadim Fedorenko
2025-02-05 12:13 ` Danielle Ratson
2025-02-05 12:20 ` Vadim Fedorenko
2025-02-05 12:25 ` Danielle Ratson
2025-02-05 2:37 ` Jakub Kicinski
2025-02-05 11:32 ` Petr Machata
2025-02-05 11:41 ` Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 11/16] qsfp: Enable JSON output support for " Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 12/16] sfpid: Add JSON output handling to --module-info in SFF8079 modules Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 13/16] sfpdiag: Add JSON output handling to --module-info in SFF8472 modules Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 14/16] ethtool: Enable JSON output support for SFF8079 and " Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 15/16] module_info: Add a new JSON file for units documentation Danielle Ratson
2025-02-04 13:39 ` [PATCH ethtool-next v3 16/16] ethtool: Add '-j' support to ethtool Danielle Ratson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20250204133957.1140677-3-danieller@nvidia.com \
--to=danieller@nvidia.com \
--cc=amcohen@nvidia.com \
--cc=daniel.zahka@gmail.com \
--cc=matt@traverse.com.au \
--cc=mkubecek@suse.cz \
--cc=nbu-mlxsw@exchange.nvidia.com \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).