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 v2 04/14] qsfp: Reorder the channel-level flags list for SFF8636 module type
Date: Wed, 29 Jan 2025 15:15:37 +0200 [thread overview]
Message-ID: <20250129131547.964711-5-danieller@nvidia.com> (raw)
In-Reply-To: <20250129131547.964711-1-danieller@nvidia.com>
Currently, when printing channel-level flags in the ethtool dump, we
iterate over a list where each element represents a flag and a channel.
The list is structured such that, for each channel, all elements with
the same flag are grouped together.
To accommodate future JSON support, where per-channel fields will be
represented as an array (with each element corresponding to a specific
channel), the presentation order needs to change.
Additionally, the hard-coded channel numbers in the flag names should
be removed.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
Notes:
v2:
* Simplify sff8636_show_dom().
module-common.c | 168 ++++++++++++++++++++++++------------------------
qsfp.c | 17 +++--
2 files changed, 95 insertions(+), 90 deletions(-)
diff --git a/module-common.c b/module-common.c
index ec61b1e..4146a84 100644
--- a/module-common.c
+++ b/module-common.c
@@ -87,112 +87,112 @@ const struct module_aw_chan module_aw_chan_flags[] = {
CMIS_RX_PWR_AW_LWARN_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
CMIS_RX_PWR_MON_MASK },
- { MODULE_TYPE_SFF8636, "Laser bias current high alarm (Chan 1)",
+ { MODULE_TYPE_SFF8636, "Laser bias current high alarm",
SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_1_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current low alarm (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, 0,(SFF8636_TX_BIAS_1_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current high warning (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_1_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser bias current low warning (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_1_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser bias current high alarm (Chan 2)",
+ { MODULE_TYPE_SFF8636, "Laser bias current high alarm",
SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current low alarm (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current high warning (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser bias current low warning (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser bias current high alarm (Chan 3)",
+ { MODULE_TYPE_SFF8636, "Laser bias current high alarm",
SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current low alarm (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current high warning (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser bias current low warning (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser bias current high alarm (Chan 4)",
+ { MODULE_TYPE_SFF8636, "Laser bias current high alarm",
SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current low alarm (Chan 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser bias current low alarm",
+ SFF8636_TX_BIAS_12_AW_OFFSET, 0,(SFF8636_TX_BIAS_1_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low alarm",
+ SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low alarm",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low alarm",
SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser bias current high warning (Chan 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser bias current high warning",
+ SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_1_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current high warning",
+ SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current high warning",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current high warning",
SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser bias current low warning (Chan 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser bias current low warning",
+ SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_1_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low warning",
+ SFF8636_TX_BIAS_12_AW_OFFSET, 0, (SFF8636_TX_BIAS_2_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low warning",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_3_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low warning",
SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_LWARN) },
- { MODULE_TYPE_SFF8636, "Laser tx power high alarm (Channel 1)",
+ { MODULE_TYPE_SFF8636, "Laser tx power high alarm",
SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power low alarm (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power high warning (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser tx power low warning (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser tx power high alarm (Channel 2)",
+ { MODULE_TYPE_SFF8636, "Laser tx power high alarm",
SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power low alarm (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power high warning (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser tx power low warning (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser tx power high alarm (Channel 3)",
+ { MODULE_TYPE_SFF8636, "Laser tx power high alarm",
SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power low alarm (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power high warning (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser tx power low warning (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser tx power high alarm (Channel 4)",
+ { MODULE_TYPE_SFF8636, "Laser tx power high alarm",
SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power low alarm (Channel 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser tx power low alarm",
+ SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low alarm",
+ SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low alarm",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low alarm",
SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser tx power high warning (Channel 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser tx power high warning",
+ SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power high warning",
+ SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power high warning",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power high warning",
SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser tx power low warning (Channel 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser tx power low warning",
+ SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_1_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low warning",
+ SFF8636_TX_PWR_12_AW_OFFSET, 0, (SFF8636_TX_PWR_2_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low warning",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_3_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low warning",
SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_LWARN) },
- { MODULE_TYPE_SFF8636, "Laser rx power high alarm (Channel 1)",
+ { MODULE_TYPE_SFF8636, "Laser rx power high alarm",
SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power low alarm (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power high warning (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser rx power low warning (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser rx power high alarm (Channel 2)",
+ { MODULE_TYPE_SFF8636, "Laser rx power high alarm",
SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power low alarm (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power high warning (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser rx power low warning (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser rx power high alarm (Channel 3)",
+ { MODULE_TYPE_SFF8636, "Laser rx power high alarm",
SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power low alarm (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power high warning (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser rx power low warning (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_LWARN) },
-
- { MODULE_TYPE_SFF8636, "Laser rx power high alarm (Channel 4)",
+ { MODULE_TYPE_SFF8636, "Laser rx power high alarm",
SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_HALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power low alarm (Channel 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser rx power low alarm",
+ SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low alarm",
+ SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low alarm",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low alarm",
SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_LALARM) },
- { MODULE_TYPE_SFF8636, "Laser rx power high warning (Channel 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser rx power high warning",
+ SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power high warning",
+ SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power high warning",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power high warning",
SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_HWARN) },
- { MODULE_TYPE_SFF8636, "Laser rx power low warning (Channel 4)",
+
+ { MODULE_TYPE_SFF8636, "Laser rx power low warning",
+ SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_1_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low warning",
+ SFF8636_RX_PWR_12_AW_OFFSET, 0, (SFF8636_RX_PWR_2_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low warning",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_3_LWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low warning",
SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_LWARN) },
{ 0, NULL, 0, 0, 0 },
diff --git a/qsfp.c b/qsfp.c
index 6c7e72c..d272dbf 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -711,13 +711,18 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
}
if (sd.supports_alarms) {
+ bool value;
+
for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
- if (module_aw_chan_flags[i].type == MODULE_TYPE_SFF8636)
- printf("\t%-41s : %s\n",
- module_aw_chan_flags[i].fmt_str,
- (map->lower_memory[module_aw_chan_flags[i].offset]
- & module_aw_chan_flags[i].adver_value) ?
- "On" : "Off");
+ if (module_aw_chan_flags[i].type != MODULE_TYPE_SFF8636)
+ continue;
+
+ value = map->lower_memory[module_aw_chan_flags[i].offset] &
+ module_aw_chan_flags[i].adver_value;
+ printf("\t%-41s (Chan %d) : %s\n",
+ module_aw_chan_flags[i].fmt_str,
+ (i % SFF8636_MAX_CHANNEL_NUM) + 1,
+ value ? "On" : "Off");
}
for (i = 0; module_aw_mod_flags[i].str; ++i) {
if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
--
2.47.0
next prev parent reply other threads:[~2025-01-29 13:16 UTC|newest]
Thread overview: 17+ messages / expand[flat|nested] mbox.gz Atom feed top
2025-01-29 13:15 [PATCH ethtool-next v2 00/14] Add JSON output to --module-info Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 01/14] module_common: Add a new file to all the common code for all module types Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 02/14] sff_common: Move sff_show_revision_compliance() to qsfp.c Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 03/14] cmis: Change loop order in cmis_show_dom_chan_lvl_flags() Danielle Ratson
2025-01-29 13:15 ` Danielle Ratson [this message]
2025-01-29 13:15 ` [PATCH ethtool-next v2 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions Danielle Ratson
2025-01-30 12:26 ` Vadim Fedorenko
2025-01-30 13:03 ` Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 06/14] module_common: Add helpers to support JSON printing for common value types Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 07/14] cmis: Add JSON output handling to --module-info in CMIS modules Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 08/14] cmis: Enable JSON output support " Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 10/14] qsfp: Enable JSON output support for " Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 11/14] sfpid: Add JSON output handling to --module-info in SFF8079 modules Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 12/14] sfpdiag: Add JSON output handling to --module-info in SFF8472 modules Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 13/14] ethtool: Enable JSON output support for SFF8079 and " Danielle Ratson
2025-01-29 13:15 ` [PATCH ethtool-next v2 14/14] 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=20250129131547.964711-5-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).