| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <20250126115635.801935-5-danieller@nvidia.com>
Date: Sun, 26 Jan 2025 13:56:25 +0200
From: Danielle Ratson <danieller@...dia.com>
To: <netdev@...r.kernel.org>
CC: <mkubecek@...e.cz>, <matt@...verse.com.au>, <daniel.zahka@...il.com>,
<amcohen@...dia.com>, <nbu-mlxsw@...hange.nvidia.com>, Danielle Ratson
<danieller@...dia.com>
Subject: [PATCH ethtool-next 04/14] qsfp: Reorder the channel-level flags list for SFF8636 module type
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@...dia.com>
---
module-common.c | 168 ++++++++++++++++++++++++------------------------
qsfp.c | 26 ++++++--
2 files changed, 104 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..674242c 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -711,13 +711,27 @@ 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");
+ int j = 1;
+
+ if (module_aw_chan_flags[i].type != MODULE_TYPE_SFF8636)
+ continue;
+
+ do {
+ 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, j,
+ value ? "On" : "Off");
+ j++;
+ i++;
+ }
+ while (module_aw_chan_flags[i].fmt_str &&
+ strcmp(module_aw_chan_flags[i].fmt_str,
+ module_aw_chan_flags[i-1].fmt_str) == 0);
+ i--;
}
for (i = 0; module_aw_mod_flags[i].str; ++i) {
if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
--
2.47.0
Powered by blists - more mailing lists