* [PATCH ethtool-next 01/14] module_common: Add a new file to all the common code for all module types
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 02/14] sff_common: Move sff_show_revision_compliance() to qsfp.c Danielle Ratson
` (12 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Currently, a significant amount of repetitive code exists across different
module type files.
Consolidate shared functions and definitions into a single, dedicated file
to improve organization and maintainability.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
Makefile.am | 7 +-
cmis.c | 212 ++++-------------
cmis.h | 65 ------
module-common.c | 506 ++++++++++++++++++++++++++++++++++++++++
module-common.h | 281 ++++++++++++++++++++++
netlink/module-eeprom.c | 26 +--
qsfp.c | 301 +++++-------------------
qsfp.h | 108 ---------
sff-common.c | 227 ------------------
sff-common.h | 77 ------
sfpdiag.c | 5 +-
sfpid.c | 62 ++---
12 files changed, 924 insertions(+), 953 deletions(-)
create mode 100644 module-common.c
create mode 100644 module-common.h
diff --git a/Makefile.am b/Makefile.am
index 5a61a9a..41290b4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -21,9 +21,10 @@ ethtool_SOURCES += \
fec.c fec_8xx.c fsl_enetc.c ibm_emac.c ixgb.c ixgbe.c \
natsemi.c pcnet32.c realtek.c tg3.c marvell.c vioc.c \
smsc911x.c at76c50x-usb.c sfc.c stmmac.c \
- sff-common.c sff-common.h sfpid.c sfpdiag.c \
- ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h fjes.c lan78xx.c \
- igc.c cmis.c cmis.h bnxt.c cpsw.c lan743x.c hns3.c
+ sff-common.c sff-common.h module-common.c module-common.h \
+ sfpid.c sfpdiag.c ixgbevf.c tse.c vmxnet3.c qsfp.c qsfp.h \
+ fjes.c lan78xx.c igc.c cmis.c cmis.h bnxt.c cpsw.c lan743x.c \
+ hns3.c
endif
if ENABLE_BASH_COMPLETION
diff --git a/cmis.c b/cmis.c
index 6fe5dfb..71f0745 100644
--- a/cmis.c
+++ b/cmis.c
@@ -11,7 +11,7 @@
#include <math.h>
#include <errno.h>
#include "internal.h"
-#include "sff-common.h"
+#include "module-common.h"
#include "cmis.h"
#include "netlink/extapi.h"
@@ -36,93 +36,19 @@ struct cmis_memory_map {
#define CMIS_PAGE_SIZE 0x80
#define CMIS_I2C_ADDRESS 0x50
-static struct {
- const char *str;
- int offset;
- __u8 value; /* Alarm is on if (offset & value) != 0. */
-} cmis_aw_mod_flags[] = {
- { "Module temperature high alarm",
- CMIS_TEMP_AW_OFFSET, CMIS_TEMP_HALARM_STATUS },
- { "Module temperature low alarm",
- CMIS_TEMP_AW_OFFSET, CMIS_TEMP_LALARM_STATUS },
- { "Module temperature high warning",
- CMIS_TEMP_AW_OFFSET, CMIS_TEMP_HWARN_STATUS },
- { "Module temperature low warning",
- CMIS_TEMP_AW_OFFSET, CMIS_TEMP_LWARN_STATUS },
-
- { "Module voltage high alarm",
- CMIS_VCC_AW_OFFSET, CMIS_VCC_HALARM_STATUS },
- { "Module voltage low alarm",
- CMIS_VCC_AW_OFFSET, CMIS_VCC_LALARM_STATUS },
- { "Module voltage high warning",
- CMIS_VCC_AW_OFFSET, CMIS_VCC_HWARN_STATUS },
- { "Module voltage low warning",
- CMIS_VCC_AW_OFFSET, CMIS_VCC_LWARN_STATUS },
-
- { NULL, 0, 0 },
-};
-
-static struct {
- const char *fmt_str;
- int offset;
- int adver_offset; /* In Page 01h. */
- __u8 adver_value; /* Supported if (offset & value) != 0. */
-} cmis_aw_chan_flags[] = {
- { "Laser bias current high alarm (Chan %d)",
- CMIS_TX_BIAS_AW_HALARM_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_BIAS_MON_MASK },
- { "Laser bias current low alarm (Chan %d)",
- CMIS_TX_BIAS_AW_LALARM_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_BIAS_MON_MASK },
- { "Laser bias current high warning (Chan %d)",
- CMIS_TX_BIAS_AW_HWARN_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_BIAS_MON_MASK },
- { "Laser bias current low warning (Chan %d)",
- CMIS_TX_BIAS_AW_LWARN_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_BIAS_MON_MASK },
-
- { "Laser tx power high alarm (Channel %d)",
- CMIS_TX_PWR_AW_HALARM_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_PWR_MON_MASK },
- { "Laser tx power low alarm (Channel %d)",
- CMIS_TX_PWR_AW_LALARM_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_PWR_MON_MASK },
- { "Laser tx power high warning (Channel %d)",
- CMIS_TX_PWR_AW_HWARN_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_PWR_MON_MASK },
- { "Laser tx power low warning (Channel %d)",
- CMIS_TX_PWR_AW_LWARN_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_TX_PWR_MON_MASK },
-
- { "Laser rx power high alarm (Channel %d)",
- CMIS_RX_PWR_AW_HALARM_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_RX_PWR_MON_MASK },
- { "Laser rx power low alarm (Channel %d)",
- CMIS_RX_PWR_AW_LALARM_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_RX_PWR_MON_MASK },
- { "Laser rx power high warning (Channel %d)",
- CMIS_RX_PWR_AW_HWARN_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_RX_PWR_MON_MASK },
- { "Laser rx power low warning (Channel %d)",
- CMIS_RX_PWR_AW_LWARN_OFFSET,
- CMIS_DIAG_CHAN_ADVER_OFFSET, CMIS_RX_PWR_MON_MASK },
-
- { NULL, 0, 0, 0 },
-};
-
static void cmis_show_identifier(const struct cmis_memory_map *map)
{
- sff8024_show_identifier(map->lower_memory, CMIS_ID_OFFSET);
+ module_show_identifier(map->lower_memory, CMIS_ID_OFFSET);
}
static void cmis_show_connector(const struct cmis_memory_map *map)
{
- sff8024_show_connector(map->page_00h, CMIS_CTOR_OFFSET);
+ module_show_connector(map->page_00h, CMIS_CTOR_OFFSET);
}
static void cmis_show_oui(const struct cmis_memory_map *map)
{
- sff8024_show_oui(map->page_00h, CMIS_VENDOR_OUI_OFFSET);
+ module_show_oui(map->page_00h, CMIS_VENDOR_OUI_OFFSET);
}
/**
@@ -154,7 +80,7 @@ cmis_show_signals_one(const struct cmis_memory_map *map, const char *name,
v |= map->upper_memory[i][0x11][off] << (i * 8);
if (map->page_01h[ioff] & imask)
- sff_show_lane_status(name, i * 8, "Yes", "No", v);
+ module_show_lane_status(name, i * 8, "Yes", "No", v);
}
static void cmis_show_signals(const struct cmis_memory_map *map)
@@ -316,63 +242,11 @@ static void cmis_show_sig_integrity(const struct cmis_memory_map *map)
*/
static void cmis_show_mit_compliance(const struct cmis_memory_map *map)
{
- static const char *cc = " (Copper cable,";
+ u16 value = map->page_00h[CMIS_MEDIA_INTF_TECH_OFFSET];
- printf("\t%-41s : 0x%02x", "Transmitter technology",
- map->page_00h[CMIS_MEDIA_INTF_TECH_OFFSET]);
-
- switch (map->page_00h[CMIS_MEDIA_INTF_TECH_OFFSET]) {
- case CMIS_850_VCSEL:
- printf(" (850 nm VCSEL)\n");
- break;
- case CMIS_1310_VCSEL:
- printf(" (1310 nm VCSEL)\n");
- break;
- case CMIS_1550_VCSEL:
- printf(" (1550 nm VCSEL)\n");
- break;
- case CMIS_1310_FP:
- printf(" (1310 nm FP)\n");
- break;
- case CMIS_1310_DFB:
- printf(" (1310 nm DFB)\n");
- break;
- case CMIS_1550_DFB:
- printf(" (1550 nm DFB)\n");
- break;
- case CMIS_1310_EML:
- printf(" (1310 nm EML)\n");
- break;
- case CMIS_1550_EML:
- printf(" (1550 nm EML)\n");
- break;
- case CMIS_OTHERS:
- printf(" (Others/Undefined)\n");
- break;
- case CMIS_1490_DFB:
- printf(" (1490 nm DFB)\n");
- break;
- case CMIS_COPPER_UNEQUAL:
- printf("%s unequalized)\n", cc);
- break;
- case CMIS_COPPER_PASS_EQUAL:
- printf("%s passive equalized)\n", cc);
- break;
- case CMIS_COPPER_NF_EQUAL:
- printf("%s near and far end limiting active equalizers)\n", cc);
- break;
- case CMIS_COPPER_F_EQUAL:
- printf("%s far end limiting active equalizers)\n", cc);
- break;
- case CMIS_COPPER_N_EQUAL:
- printf("%s near end limiting active equalizers)\n", cc);
- break;
- case CMIS_COPPER_LINEAR_EQUAL:
- printf("%s linear active equalizers)\n", cc);
- break;
- }
+ module_show_mit_compliance(value);
- if (map->page_00h[CMIS_MEDIA_INTF_TECH_OFFSET] >= CMIS_COPPER_UNEQUAL) {
+ if (value >= CMIS_COPPER_UNEQUAL) {
printf("\t%-41s : %udb\n", "Attenuation at 5GHz",
map->page_00h[CMIS_COPPER_ATT_5GHZ]);
printf("\t%-41s : %udb\n", "Attenuation at 7GHz",
@@ -403,14 +277,14 @@ static void cmis_show_link_len(const struct cmis_memory_map *map)
cmis_print_smf_cbl_len(map);
if (!map->page_01h)
return;
- sff_show_value_with_unit(map->page_01h, CMIS_OM5_LEN_OFFSET,
- "Length (OM5)", 2, "m");
- sff_show_value_with_unit(map->page_01h, CMIS_OM4_LEN_OFFSET,
- "Length (OM4)", 2, "m");
- sff_show_value_with_unit(map->page_01h, CMIS_OM3_LEN_OFFSET,
- "Length (OM3 50/125um)", 2, "m");
- sff_show_value_with_unit(map->page_01h, CMIS_OM2_LEN_OFFSET,
- "Length (OM2 50/125um)", 1, "m");
+ module_show_value_with_unit(map->page_01h, CMIS_OM5_LEN_OFFSET,
+ "Length (OM5)", 2, "m");
+ 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");
+ module_show_value_with_unit(map->page_01h, CMIS_OM2_LEN_OFFSET,
+ "Length (OM2 50/125um)", 1, "m");
}
/**
@@ -422,22 +296,22 @@ static void cmis_show_vendor_info(const struct cmis_memory_map *map)
{
const char *clei;
- sff_show_ascii(map->page_00h, CMIS_VENDOR_NAME_START_OFFSET,
- CMIS_VENDOR_NAME_END_OFFSET, "Vendor name");
+ module_show_ascii(map->page_00h, CMIS_VENDOR_NAME_START_OFFSET,
+ CMIS_VENDOR_NAME_END_OFFSET, "Vendor name");
cmis_show_oui(map);
- sff_show_ascii(map->page_00h, CMIS_VENDOR_PN_START_OFFSET,
- CMIS_VENDOR_PN_END_OFFSET, "Vendor PN");
- sff_show_ascii(map->page_00h, CMIS_VENDOR_REV_START_OFFSET,
- CMIS_VENDOR_REV_END_OFFSET, "Vendor rev");
- sff_show_ascii(map->page_00h, CMIS_VENDOR_SN_START_OFFSET,
- CMIS_VENDOR_SN_END_OFFSET, "Vendor SN");
- sff_show_ascii(map->page_00h, CMIS_DATE_YEAR_OFFSET,
- CMIS_DATE_VENDOR_LOT_OFFSET + 1, "Date code");
+ module_show_ascii(map->page_00h, CMIS_VENDOR_PN_START_OFFSET,
+ CMIS_VENDOR_PN_END_OFFSET, "Vendor PN");
+ module_show_ascii(map->page_00h, CMIS_VENDOR_REV_START_OFFSET,
+ CMIS_VENDOR_REV_END_OFFSET, "Vendor rev");
+ module_show_ascii(map->page_00h, CMIS_VENDOR_SN_START_OFFSET,
+ CMIS_VENDOR_SN_END_OFFSET, "Vendor SN");
+ module_show_ascii(map->page_00h, CMIS_DATE_YEAR_OFFSET,
+ CMIS_DATE_VENDOR_LOT_OFFSET + 1, "Date code");
clei = (const char *)(map->page_00h + CMIS_CLEI_START_OFFSET);
if (*clei && strncmp(clei, CMIS_CLEI_BLANK, CMIS_CLEI_LEN))
- sff_show_ascii(map->page_00h, CMIS_CLEI_START_OFFSET,
- CMIS_CLEI_END_OFFSET, "CLEI code");
+ module_show_ascii(map->page_00h, CMIS_CLEI_START_OFFSET,
+ CMIS_CLEI_END_OFFSET, "CLEI code");
}
/* Print the current Module State. Relevant documents:
@@ -670,15 +544,6 @@ static void cmis_parse_dom(const struct cmis_memory_map *map,
cmis_parse_dom_chan_lvl_thresh(map, sd);
}
-/* Print module-level monitoring values. Relevant documents:
- * [1] CMIS Rev. 5, page 110, section 8.2.5, Table 8-9
- */
-static void cmis_show_dom_mod_lvl_monitors(const struct sff_diags *sd)
-{
- PRINT_TEMP("Module temperature", sd->sfp_temp[MCURR]);
- PRINT_VCC("Module voltage", sd->sfp_voltage[MCURR]);
-}
-
/* Print channel Tx laser bias current. Relevant documents:
* [1] CMIS Rev. 5, page 165, section 8.9.4, Table 8-79
*/
@@ -806,10 +671,11 @@ static void cmis_show_dom_mod_lvl_flags(const struct cmis_memory_map *map)
{
int i;
- for (i = 0; cmis_aw_mod_flags[i].str; i++) {
- printf("\t%-41s : %s\n", cmis_aw_mod_flags[i].str,
- map->lower_memory[cmis_aw_mod_flags[i].offset] &
- cmis_aw_mod_flags[i].value ? "On" : "Off");
+ for (i = 0; module_aw_mod_flags[i].str; i++) {
+ if (module_aw_mod_flags[i].type == MODULE_TYPE_CMIS)
+ printf("\t%-41s : %s\n", module_aw_mod_flags[i].str,
+ map->lower_memory[module_aw_mod_flags[i].offset] &
+ module_aw_mod_flags[i].value ? "On" : "Off");
}
}
@@ -823,16 +689,16 @@ static void cmis_show_dom_chan_lvl_flags_chan(const struct cmis_memory_map *map,
const __u8 *page_11h = map->upper_memory[bank][0x11];
int i;
- for (i = 0; cmis_aw_chan_flags[i].fmt_str; i++) {
+ for (i = 0; module_aw_chan_flags[i].fmt_str; i++) {
char str[80];
- if (!(map->page_01h[cmis_aw_chan_flags[i].adver_offset] &
- cmis_aw_chan_flags[i].adver_value))
+ if (!(map->page_01h[module_aw_chan_flags[i].adver_offset] &
+ module_aw_chan_flags[i].adver_value))
continue;
- snprintf(str, 80, cmis_aw_chan_flags[i].fmt_str, chan + 1);
+ snprintf(str, 80, module_aw_chan_flags[i].fmt_str, chan + 1);
printf("\t%-41s : %s\n", str,
- page_11h[cmis_aw_chan_flags[i].offset] & chan ?
+ page_11h[module_aw_chan_flags[i].offset] & chan ?
"On" : "Off");
}
}
@@ -876,7 +742,7 @@ static void cmis_show_dom(const struct cmis_memory_map *map)
cmis_parse_dom(map, &sd);
- cmis_show_dom_mod_lvl_monitors(&sd);
+ module_show_dom_mod_lvl_monitors(&sd);
cmis_show_dom_chan_lvl_monitors(map, &sd);
cmis_show_dom_mod_lvl_flags(map);
cmis_show_dom_chan_lvl_flags(map);
diff --git a/cmis.h b/cmis.h
index cee2a38..007632a 100644
--- a/cmis.h
+++ b/cmis.h
@@ -16,18 +16,6 @@
#define CMIS_MODULE_STATE_MODULE_PWR_DN 0x04
#define CMIS_MODULE_STATE_MODULE_FAULT 0x05
-/* Module Flags (Page 0) */
-#define CMIS_VCC_AW_OFFSET 0x09
-#define CMIS_VCC_LWARN_STATUS 0x80
-#define CMIS_VCC_HWARN_STATUS 0x40
-#define CMIS_VCC_LALARM_STATUS 0x20
-#define CMIS_VCC_HALARM_STATUS 0x10
-#define CMIS_TEMP_AW_OFFSET 0x09
-#define CMIS_TEMP_LWARN_STATUS 0x08
-#define CMIS_TEMP_HWARN_STATUS 0x04
-#define CMIS_TEMP_LALARM_STATUS 0x02
-#define CMIS_TEMP_HALARM_STATUS 0x01
-
#define CMIS_MODULE_TYPE_OFFSET 0x55
#define CMIS_MT_MMF 0x01
#define CMIS_MT_SMF 0x02
@@ -115,22 +103,6 @@
/* Media interface technology */
#define CMIS_MEDIA_INTF_TECH_OFFSET 0xD4
-#define CMIS_850_VCSEL 0x00
-#define CMIS_1310_VCSEL 0x01
-#define CMIS_1550_VCSEL 0x02
-#define CMIS_1310_FP 0x03
-#define CMIS_1310_DFB 0x04
-#define CMIS_1550_DFB 0x05
-#define CMIS_1310_EML 0x06
-#define CMIS_1550_EML 0x07
-#define CMIS_OTHERS 0x08
-#define CMIS_1490_DFB 0x09
-#define CMIS_COPPER_UNEQUAL 0x0A
-#define CMIS_COPPER_PASS_EQUAL 0x0B
-#define CMIS_COPPER_NF_EQUAL 0x0C
-#define CMIS_COPPER_F_EQUAL 0x0D
-#define CMIS_COPPER_N_EQUAL 0x0E
-#define CMIS_COPPER_LINEAR_EQUAL 0x0F
/*-----------------------------------------------------------------------
* Upper Memory Page 0x01: contains advertising fields that define properties
@@ -178,10 +150,6 @@
#define CMIS_DIAG_FL_RX_LOS (1 << 1)
/* Supported Monitors Advertisement (Page 1) */
-#define CMIS_DIAG_CHAN_ADVER_OFFSET 0xA0
-#define CMIS_TX_BIAS_MON_MASK 0x01
-#define CMIS_TX_PWR_MON_MASK 0x02
-#define CMIS_RX_PWR_MON_MASK 0x04
#define CMIS_TX_BIAS_MUL_MASK 0x18
#define CMIS_TX_BIAS_MUL_1 0x00
#define CMIS_TX_BIAS_MUL_2 0x08
@@ -231,39 +199,6 @@
#define CMIS_RX_PWR_HWARN_OFFSET 0xC4
#define CMIS_RX_PWR_LWARN_OFFSET 0xC6
-/*-----------------------------------------------------------------------
- * Upper Memory Page 0x11: Optional Page that contains lane dynamic status
- * bytes.
- */
-
-/* Media Lane-Specific Flags (Page 0x11) */
-#define CMIS_TX_FAIL_OFFSET 0x87
-#define CMIS_TX_LOS_OFFSET 0x88
-#define CMIS_TX_LOL_OFFSET 0x89
-#define CMIS_TX_EQ_FAIL_OFFSET 0x8a
-#define CMIS_TX_PWR_AW_HALARM_OFFSET 0x8B
-#define CMIS_TX_PWR_AW_LALARM_OFFSET 0x8C
-#define CMIS_TX_PWR_AW_HWARN_OFFSET 0x8D
-#define CMIS_TX_PWR_AW_LWARN_OFFSET 0x8E
-#define CMIS_TX_BIAS_AW_HALARM_OFFSET 0x8F
-#define CMIS_TX_BIAS_AW_LALARM_OFFSET 0x90
-#define CMIS_TX_BIAS_AW_HWARN_OFFSET 0x91
-#define CMIS_TX_BIAS_AW_LWARN_OFFSET 0x92
-#define CMIS_RX_LOS_OFFSET 0x93
-#define CMIS_RX_LOL_OFFSET 0x94
-#define CMIS_RX_PWR_AW_HALARM_OFFSET 0x95
-#define CMIS_RX_PWR_AW_LALARM_OFFSET 0x96
-#define CMIS_RX_PWR_AW_HWARN_OFFSET 0x97
-#define CMIS_RX_PWR_AW_LWARN_OFFSET 0x98
-
-/* Media Lane-Specific Monitors (Page 0x11) */
-#define CMIS_TX_PWR_OFFSET 0x9A
-#define CMIS_TX_BIAS_OFFSET 0xAA
-#define CMIS_RX_PWR_OFFSET 0xBA
-
-#define YESNO(x) (((x) != 0) ? "Yes" : "No")
-#define ONOFF(x) (((x) != 0) ? "On" : "Off")
-
void cmis_show_all_ioctl(const __u8 *id);
int cmis_show_all_nl(struct cmd_context *ctx);
diff --git a/module-common.c b/module-common.c
new file mode 100644
index 0000000..ec61b1e
--- /dev/null
+++ b/module-common.c
@@ -0,0 +1,506 @@
+/*
+ * module-common.c: Implements common utilities across CMIS, SFF-8436/8636
+ * and SFF-8472/8079.
+ */
+
+#include <stdio.h>
+#include <math.h>
+#include "module-common.h"
+
+const struct module_aw_mod module_aw_mod_flags[] = {
+ { MODULE_TYPE_CMIS, "Module temperature high alarm",
+ CMIS_TEMP_AW_OFFSET, CMIS_TEMP_HALARM_STATUS },
+ { MODULE_TYPE_CMIS, "Module temperature low alarm",
+ CMIS_TEMP_AW_OFFSET, CMIS_TEMP_LALARM_STATUS },
+ { MODULE_TYPE_CMIS, "Module temperature high warning",
+ CMIS_TEMP_AW_OFFSET, CMIS_TEMP_HWARN_STATUS },
+ { MODULE_TYPE_CMIS, "Module temperature low warning",
+ CMIS_TEMP_AW_OFFSET, CMIS_TEMP_LWARN_STATUS },
+
+ { MODULE_TYPE_CMIS, "Module voltage high alarm",
+ CMIS_VCC_AW_OFFSET, CMIS_VCC_HALARM_STATUS },
+ { MODULE_TYPE_CMIS, "Module voltage low alarm",
+ CMIS_VCC_AW_OFFSET, CMIS_VCC_LALARM_STATUS },
+ { MODULE_TYPE_CMIS, "Module voltage high warning",
+ CMIS_VCC_AW_OFFSET, CMIS_VCC_HWARN_STATUS },
+ { MODULE_TYPE_CMIS, "Module voltage low warning",
+ CMIS_VCC_AW_OFFSET, CMIS_VCC_LWARN_STATUS },
+
+ { MODULE_TYPE_SFF8636, "Module temperature high alarm",
+ SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_HALARM_STATUS) },
+ { MODULE_TYPE_SFF8636, "Module temperature low alarm",
+ SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_LALARM_STATUS) },
+ { MODULE_TYPE_SFF8636, "Module temperature high warning",
+ SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_HWARN_STATUS) },
+ { MODULE_TYPE_SFF8636, "Module temperature low warning",
+ SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_LWARN_STATUS) },
+
+ { MODULE_TYPE_SFF8636, "Module voltage high alarm",
+ SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_HALARM_STATUS) },
+ { MODULE_TYPE_SFF8636, "Module voltage low alarm",
+ SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_LALARM_STATUS) },
+ { MODULE_TYPE_SFF8636, "Module voltage high warning",
+ SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_HWARN_STATUS) },
+ { MODULE_TYPE_SFF8636, "Module voltage low warning",
+ SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_LWARN_STATUS) },
+
+ { 0, NULL, 0, 0 },
+};
+
+const struct module_aw_chan module_aw_chan_flags[] = {
+ { MODULE_TYPE_CMIS, "Laser bias current high alarm",
+ CMIS_TX_BIAS_AW_HALARM_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_BIAS_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser bias current low alarm",
+ CMIS_TX_BIAS_AW_LALARM_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_BIAS_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser bias current high warning",
+ CMIS_TX_BIAS_AW_HWARN_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_BIAS_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser bias current low warning",
+ CMIS_TX_BIAS_AW_LWARN_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_BIAS_MON_MASK },
+
+ { MODULE_TYPE_CMIS, "Laser tx power high alarm",
+ CMIS_TX_PWR_AW_HALARM_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_PWR_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser tx power low alarm",
+ CMIS_TX_PWR_AW_LALARM_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_PWR_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser tx power high warning",
+ CMIS_TX_PWR_AW_HWARN_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_PWR_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser tx power low warning",
+ CMIS_TX_PWR_AW_LWARN_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_TX_PWR_MON_MASK },
+
+ { MODULE_TYPE_CMIS, "Laser rx power high alarm",
+ CMIS_RX_PWR_AW_HALARM_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_RX_PWR_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser rx power low alarm",
+ CMIS_RX_PWR_AW_LALARM_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_RX_PWR_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser rx power high warning",
+ CMIS_RX_PWR_AW_HWARN_OFFSET, CMIS_DIAG_CHAN_ADVER_OFFSET,
+ CMIS_RX_PWR_MON_MASK },
+ { MODULE_TYPE_CMIS, "Laser rx power low warning",
+ 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)",
+ 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)",
+ 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)",
+ 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)",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_HALARM) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low alarm (Chan 4)",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser bias current high warning (Chan 4)",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser bias current low warning (Chan 4)",
+ SFF8636_TX_BIAS_34_AW_OFFSET, 0, (SFF8636_TX_BIAS_4_LWARN) },
+
+ { MODULE_TYPE_SFF8636, "Laser tx power high alarm (Channel 1)",
+ 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)",
+ 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)",
+ 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)",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_HALARM) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low alarm (Channel 4)",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser tx power high warning (Channel 4)",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser tx power low warning (Channel 4)",
+ SFF8636_TX_PWR_34_AW_OFFSET, 0, (SFF8636_TX_PWR_4_LWARN) },
+
+ { MODULE_TYPE_SFF8636, "Laser rx power high alarm (Channel 1)",
+ 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)",
+ 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)",
+ 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)",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_HALARM) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low alarm (Channel 4)",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_LALARM) },
+ { MODULE_TYPE_SFF8636, "Laser rx power high warning (Channel 4)",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_HWARN) },
+ { MODULE_TYPE_SFF8636, "Laser rx power low warning (Channel 4)",
+ SFF8636_RX_PWR_34_AW_OFFSET, 0, (SFF8636_RX_PWR_4_LWARN) },
+
+ { 0, NULL, 0, 0, 0 },
+};
+
+void module_show_value_with_unit(const __u8 *id, unsigned int reg,
+ const char *name, unsigned int mult,
+ const char *unit)
+{
+ unsigned int val = id[reg];
+
+ printf("\t%-41s : %u%s\n", name, val * mult, unit);
+}
+
+void module_show_ascii(const __u8 *id, unsigned int first_reg,
+ unsigned int last_reg, const char *name)
+{
+ unsigned int reg, val;
+
+ printf("\t%-41s : ", name);
+ while (first_reg <= last_reg && id[last_reg] == ' ')
+ last_reg--;
+ for (reg = first_reg; reg <= last_reg; reg++) {
+ val = id[reg];
+ putchar(((val >= 32) && (val <= 126)) ? val : '_');
+ }
+ printf("\n");
+}
+
+void module_show_lane_status(const char *name, unsigned int lane_cnt,
+ const char *yes, const char *no,
+ unsigned int value)
+{
+ printf("\t%-41s : ", name);
+ if (!value) {
+ printf("None\n");
+ return;
+ }
+
+ printf("[");
+ while (lane_cnt--) {
+ printf(" %s%c", value & 1 ? yes : no, lane_cnt ? ',': ' ');
+ value >>= 1;
+ }
+ printf("]\n");
+}
+
+void module_show_oui(const __u8 *id, int id_offset)
+{
+ printf("\t%-41s : %02x:%02x:%02x\n", "Vendor OUI",
+ id[id_offset], id[(id_offset) + 1],
+ id[(id_offset) + 2]);
+}
+
+void module_show_identifier(const __u8 *id, int id_offset)
+{
+ printf("\t%-41s : 0x%02x", "Identifier", id[id_offset]);
+ switch (id[id_offset]) {
+ case MODULE_ID_UNKNOWN:
+ printf(" (no module present, unknown, or unspecified)\n");
+ break;
+ case MODULE_ID_GBIC:
+ printf(" (GBIC)\n");
+ break;
+ case MODULE_ID_SOLDERED_MODULE:
+ printf(" (module soldered to motherboard)\n");
+ break;
+ case MODULE_ID_SFP:
+ printf(" (SFP)\n");
+ break;
+ case MODULE_ID_300_PIN_XBI:
+ printf(" (300 pin XBI)\n");
+ break;
+ case MODULE_ID_XENPAK:
+ printf(" (XENPAK)\n");
+ break;
+ case MODULE_ID_XFP:
+ printf(" (XFP)\n");
+ break;
+ case MODULE_ID_XFF:
+ printf(" (XFF)\n");
+ break;
+ case MODULE_ID_XFP_E:
+ printf(" (XFP-E)\n");
+ break;
+ case MODULE_ID_XPAK:
+ printf(" (XPAK)\n");
+ break;
+ case MODULE_ID_X2:
+ printf(" (X2)\n");
+ break;
+ case MODULE_ID_DWDM_SFP:
+ printf(" (DWDM-SFP)\n");
+ break;
+ case MODULE_ID_QSFP:
+ printf(" (QSFP)\n");
+ break;
+ case MODULE_ID_QSFP_PLUS:
+ printf(" (QSFP+)\n");
+ break;
+ case MODULE_ID_CXP:
+ printf(" (CXP)\n");
+ break;
+ case MODULE_ID_HD4X:
+ printf(" (Shielded Mini Multilane HD 4X)\n");
+ break;
+ case MODULE_ID_HD8X:
+ printf(" (Shielded Mini Multilane HD 8X)\n");
+ break;
+ case MODULE_ID_QSFP28:
+ printf(" (QSFP28)\n");
+ break;
+ case MODULE_ID_CXP2:
+ printf(" (CXP2/CXP28)\n");
+ break;
+ case MODULE_ID_CDFP:
+ printf(" (CDFP Style 1/Style 2)\n");
+ break;
+ case MODULE_ID_HD4X_FANOUT:
+ printf(" (Shielded Mini Multilane HD 4X Fanout Cable)\n");
+ break;
+ case MODULE_ID_HD8X_FANOUT:
+ printf(" (Shielded Mini Multilane HD 8X Fanout Cable)\n");
+ break;
+ case MODULE_ID_CDFP_S3:
+ printf(" (CDFP Style 3)\n");
+ break;
+ case MODULE_ID_MICRO_QSFP:
+ printf(" (microQSFP)\n");
+ break;
+ case MODULE_ID_QSFP_DD:
+ printf(" (QSFP-DD Double Density 8X Pluggable Transceiver (INF-8628))\n");
+ break;
+ case MODULE_ID_OSFP:
+ printf(" (OSFP 8X Pluggable Transceiver)\n");
+ break;
+ case MODULE_ID_DSFP:
+ printf(" (DSFP Dual Small Form Factor Pluggable Transceiver)\n");
+ break;
+ case MODULE_ID_QSFP_PLUS_CMIS:
+ printf(" (QSFP+ or later with Common Management Interface Specification (CMIS))\n");
+ break;
+ case MODULE_ID_SFP_DD_CMIS:
+ printf(" (SFP-DD Double Density 2X Pluggable Transceiver with Common Management Interface Specification (CMIS))\n");
+ break;
+ case MODULE_ID_SFP_PLUS_CMIS:
+ printf(" (SFP+ and later with Common Management Interface Specification (CMIS))\n");
+ break;
+ default:
+ printf(" (reserved or unknown)\n");
+ break;
+ }
+}
+
+void module_show_connector(const __u8 *id, int ctor_offset)
+{
+ printf("\t%-41s : 0x%02x", "Connector", id[ctor_offset]);
+ switch (id[ctor_offset]) {
+ case MODULE_CTOR_UNKNOWN:
+ printf(" (unknown or unspecified)\n");
+ break;
+ case MODULE_CTOR_SC:
+ printf(" (SC)\n");
+ break;
+ case MODULE_CTOR_FC_STYLE_1:
+ printf(" (Fibre Channel Style 1 copper)\n");
+ break;
+ case MODULE_CTOR_FC_STYLE_2:
+ printf(" (Fibre Channel Style 2 copper)\n");
+ break;
+ case MODULE_CTOR_BNC_TNC:
+ printf(" (BNC/TNC)\n");
+ break;
+ case MODULE_CTOR_FC_COAX:
+ printf(" (Fibre Channel coaxial headers)\n");
+ break;
+ case MODULE_CTOR_FIBER_JACK:
+ printf(" (FibreJack)\n");
+ break;
+ case MODULE_CTOR_LC:
+ printf(" (LC)\n");
+ break;
+ case MODULE_CTOR_MT_RJ:
+ printf(" (MT-RJ)\n");
+ break;
+ case MODULE_CTOR_MU:
+ printf(" (MU)\n");
+ break;
+ case MODULE_CTOR_SG:
+ printf(" (SG)\n");
+ break;
+ case MODULE_CTOR_OPT_PT:
+ printf(" (Optical pigtail)\n");
+ break;
+ case MODULE_CTOR_MPO:
+ printf(" (MPO Parallel Optic)\n");
+ break;
+ case MODULE_CTOR_MPO_2:
+ printf(" (MPO Parallel Optic - 2x16)\n");
+ break;
+ case MODULE_CTOR_HSDC_II:
+ printf(" (HSSDC II)\n");
+ break;
+ case MODULE_CTOR_COPPER_PT:
+ printf(" (Copper pigtail)\n");
+ break;
+ case MODULE_CTOR_RJ45:
+ printf(" (RJ45)\n");
+ break;
+ case MODULE_CTOR_NO_SEPARABLE:
+ printf(" (No separable connector)\n");
+ break;
+ case MODULE_CTOR_MXC_2x16:
+ printf(" (MXC 2x16)\n");
+ break;
+ case MODULE_CTOR_CS_OPTICAL:
+ printf(" (CS optical connector)\n");
+ break;
+ case MODULE_CTOR_CS_OPTICAL_MINI:
+ printf(" (Mini CS optical connector)\n");
+ break;
+ case MODULE_CTOR_MPO_2X12:
+ printf(" (MPO 2x12)\n");
+ break;
+ case MODULE_CTOR_MPO_1X16:
+ printf(" (MPO 1x16)\n");
+ break;
+ default:
+ printf(" (reserved or unknown)\n");
+ break;
+ }
+}
+
+void module_show_mit_compliance(u16 value)
+{
+ static const char *cc = " (Copper cable,";
+
+ printf("\t%-41s : 0x%02x", "Transmitter technology", value);
+
+ switch (value) {
+ case MODULE_850_VCSEL:
+ printf(" (850 nm VCSEL)\n");
+ break;
+ case CMIS_1310_VCSEL:
+ case SFF8636_TRANS_1310_VCSEL:
+ printf(" (1310 nm VCSEL)\n");
+ break;
+ case CMIS_1550_VCSEL:
+ case SFF8636_TRANS_1550_VCSEL:
+ printf(" (1550 nm VCSEL)\n");
+ break;
+ case CMIS_1310_FP:
+ case SFF8636_TRANS_1310_FP:
+ printf(" (1310 nm FP)\n");
+ break;
+ case CMIS_1310_DFB:
+ case SFF8636_TRANS_1310_DFB:
+ printf(" (1310 nm DFB)\n");
+ break;
+ case CMIS_1550_DFB:
+ case SFF8636_TRANS_1550_DFB:
+ printf(" (1550 nm DFB)\n");
+ break;
+ case CMIS_1310_EML:
+ case SFF8636_TRANS_1310_EML:
+ printf(" (1310 nm EML)\n");
+ break;
+ case CMIS_1550_EML:
+ case SFF8636_TRANS_1550_EML:
+ printf(" (1550 nm EML)\n");
+ break;
+ case CMIS_OTHERS:
+ case SFF8636_TRANS_OTHERS:
+ printf(" (Others/Undefined)\n");
+ break;
+ case CMIS_1490_DFB:
+ case SFF8636_TRANS_1490_DFB:
+ printf(" (1490 nm DFB)\n");
+ break;
+ case CMIS_COPPER_UNEQUAL:
+ case SFF8636_TRANS_COPPER_PAS_UNEQUAL:
+ printf("%s unequalized)\n", cc);
+ break;
+ case CMIS_COPPER_PASS_EQUAL:
+ case SFF8636_TRANS_COPPER_PAS_EQUAL:
+ printf("%s passive equalized)\n", cc);
+ break;
+ case CMIS_COPPER_NF_EQUAL:
+ case SFF8636_TRANS_COPPER_LNR_FAR_EQUAL:
+ printf("%s near and far end limiting active equalizers)\n", cc);
+ break;
+ case CMIS_COPPER_F_EQUAL:
+ case SFF8636_TRANS_COPPER_FAR_EQUAL:
+ printf("%s far end limiting active equalizers)\n", cc);
+ break;
+ case CMIS_COPPER_N_EQUAL:
+ case SFF8636_TRANS_COPPER_NEAR_EQUAL:
+ printf("%s near end limiting active equalizers)\n", cc);
+ break;
+ case CMIS_COPPER_LINEAR_EQUAL:
+ case SFF8636_TRANS_COPPER_LNR_EQUAL:
+ printf("%s linear active equalizers)\n", cc);
+ break;
+ }
+}
+
+void module_show_dom_mod_lvl_monitors(const struct sff_diags *sd)
+{
+ PRINT_TEMP("Module temperature", sd->sfp_temp[MCURR]);
+ PRINT_VCC("Module voltage", sd->sfp_voltage[MCURR]);
+}
diff --git a/module-common.h b/module-common.h
new file mode 100644
index 0000000..8c34779
--- /dev/null
+++ b/module-common.h
@@ -0,0 +1,281 @@
+/*
+ * module-common.h: Declares common utilities across CMIS, SFF-8436/8636
+ * and SFF-8472/8079.
+ */
+
+#ifndef MODULE_COMMON_H__
+#define MODULE_COMMON_H__
+
+#include <stdio.h>
+#include "internal.h"
+#include "sff-common.h"
+
+enum module_type {
+ MODULE_TYPE_SFF8636,
+ MODULE_TYPE_CMIS,
+};
+
+#define MODULE_ID_OFFSET 0x00
+#define MODULE_ID_UNKNOWN 0x00
+#define MODULE_ID_GBIC 0x01
+#define MODULE_ID_SOLDERED_MODULE 0x02
+#define MODULE_ID_SFP 0x03
+#define MODULE_ID_300_PIN_XBI 0x04
+#define MODULE_ID_XENPAK 0x05
+#define MODULE_ID_XFP 0x06
+#define MODULE_ID_XFF 0x07
+#define MODULE_ID_XFP_E 0x08
+#define MODULE_ID_XPAK 0x09
+#define MODULE_ID_X2 0x0A
+#define MODULE_ID_DWDM_SFP 0x0B
+#define MODULE_ID_QSFP 0x0C
+#define MODULE_ID_QSFP_PLUS 0x0D
+#define MODULE_ID_CXP 0x0E
+#define MODULE_ID_HD4X 0x0F
+#define MODULE_ID_HD8X 0x10
+#define MODULE_ID_QSFP28 0x11
+#define MODULE_ID_CXP2 0x12
+#define MODULE_ID_CDFP 0x13
+#define MODULE_ID_HD4X_FANOUT 0x14
+#define MODULE_ID_HD8X_FANOUT 0x15
+#define MODULE_ID_CDFP_S3 0x16
+#define MODULE_ID_MICRO_QSFP 0x17
+#define MODULE_ID_QSFP_DD 0x18
+#define MODULE_ID_OSFP 0x19
+#define MODULE_ID_DSFP 0x1B
+#define MODULE_ID_QSFP_PLUS_CMIS 0x1E
+#define MODULE_ID_SFP_DD_CMIS 0x1F
+#define MODULE_ID_SFP_PLUS_CMIS 0x20
+#define MODULE_ID_LAST MODULE_ID_SFP_PLUS_CMIS
+#define MODULE_ID_UNALLOCATED_LAST 0x7F
+#define MODULE_ID_VENDOR_START 0x80
+#define MODULE_ID_VENDOR_LAST 0xFF
+
+#define MODULE_CTOR_UNKNOWN 0x00
+#define MODULE_CTOR_SC 0x01
+#define MODULE_CTOR_FC_STYLE_1 0x02
+#define MODULE_CTOR_FC_STYLE_2 0x03
+#define MODULE_CTOR_BNC_TNC 0x04
+#define MODULE_CTOR_FC_COAX 0x05
+#define MODULE_CTOR_FIBER_JACK 0x06
+#define MODULE_CTOR_LC 0x07
+#define MODULE_CTOR_MT_RJ 0x08
+#define MODULE_CTOR_MU 0x09
+#define MODULE_CTOR_SG 0x0A
+#define MODULE_CTOR_OPT_PT 0x0B
+#define MODULE_CTOR_MPO 0x0C
+#define MODULE_CTOR_MPO_2 0x0D
+/* 0E-1Fh --- Reserved */
+#define MODULE_CTOR_HSDC_II 0x20
+#define MODULE_CTOR_COPPER_PT 0x21
+#define MODULE_CTOR_RJ45 0x22
+#define MODULE_CTOR_NO_SEPARABLE 0x23
+#define MODULE_CTOR_MXC_2x16 0x24
+#define MODULE_CTOR_CS_OPTICAL 0x25
+#define MODULE_CTOR_CS_OPTICAL_MINI 0x26
+#define MODULE_CTOR_MPO_2X12 0x27
+#define MODULE_CTOR_MPO_1X16 0x28
+#define MODULE_CTOR_LAST MODULE_CTOR_MPO_1X16
+
+#define MODULE_CTOR_NO_SEP_QSFP_DD 0x6F
+#define MODULE_CTOR_UNALLOCATED_LAST 0x7F
+#define MODULE_CTOR_VENDOR_START 0x80
+#define MODULE_CTOR_VENDOR_LAST 0xFF
+
+/* Transmitter Technology */
+#define MODULE_850_VCSEL 0x00
+
+/* SFF8636 */
+#define SFF8636_TRANS_TECH_MASK 0xF0
+#define SFF8636_TRANS_COPPER_LNR_EQUAL (15 << 4)
+#define SFF8636_TRANS_COPPER_NEAR_EQUAL (14 << 4)
+#define SFF8636_TRANS_COPPER_FAR_EQUAL (13 << 4)
+#define SFF8636_TRANS_COPPER_LNR_FAR_EQUAL (12 << 4)
+#define SFF8636_TRANS_COPPER_PAS_EQUAL (11 << 4)
+#define SFF8636_TRANS_COPPER_PAS_UNEQUAL (10 << 4)
+#define SFF8636_TRANS_1490_DFB (9 << 4)
+#define SFF8636_TRANS_OTHERS (8 << 4)
+#define SFF8636_TRANS_1550_EML (7 << 4)
+#define SFF8636_TRANS_1310_EML (6 << 4)
+#define SFF8636_TRANS_1550_DFB (5 << 4)
+#define SFF8636_TRANS_1310_DFB (4 << 4)
+#define SFF8636_TRANS_1310_FP (3 << 4)
+#define SFF8636_TRANS_1550_VCSEL (2 << 4)
+#define SFF8636_TRANS_1310_VCSEL (1 << 4)
+
+/* CMIS */
+#define CMIS_1310_VCSEL 0x01
+#define CMIS_1550_VCSEL 0x02
+#define CMIS_1310_FP 0x03
+#define CMIS_1310_DFB 0x04
+#define CMIS_1550_DFB 0x05
+#define CMIS_1310_EML 0x06
+#define CMIS_1550_EML 0x07
+#define CMIS_OTHERS 0x08
+#define CMIS_1490_DFB 0x09
+#define CMIS_COPPER_UNEQUAL 0x0A
+#define CMIS_COPPER_PASS_EQUAL 0x0B
+#define CMIS_COPPER_NF_EQUAL 0x0C
+#define CMIS_COPPER_F_EQUAL 0x0D
+#define CMIS_COPPER_N_EQUAL 0x0E
+#define CMIS_COPPER_LINEAR_EQUAL 0x0F
+
+/* Module Flags (Page 0) */
+#define CMIS_VCC_AW_OFFSET 0x09
+#define CMIS_VCC_LWARN_STATUS 0x80
+#define CMIS_VCC_HWARN_STATUS 0x40
+#define CMIS_VCC_LALARM_STATUS 0x20
+#define CMIS_VCC_HALARM_STATUS 0x10
+#define CMIS_TEMP_AW_OFFSET 0x09
+#define CMIS_TEMP_LWARN_STATUS 0x08
+#define CMIS_TEMP_HWARN_STATUS 0x04
+#define CMIS_TEMP_LALARM_STATUS 0x02
+#define CMIS_TEMP_HALARM_STATUS 0x01
+
+/* Supported Monitors Advertisement (Page 1) */
+#define CMIS_DIAG_CHAN_ADVER_OFFSET 0xA0
+
+/* Module Monitor Interrupt Flags - 6-8 */
+#define SFF8636_TEMP_AW_OFFSET 0x06
+#define SFF8636_TEMP_HALARM_STATUS (1 << 7)
+#define SFF8636_TEMP_LALARM_STATUS (1 << 6)
+#define SFF8636_TEMP_HWARN_STATUS (1 << 5)
+#define SFF8636_TEMP_LWARN_STATUS (1 << 4)
+
+#define SFF8636_VCC_AW_OFFSET 0x07
+#define SFF8636_VCC_HALARM_STATUS (1 << 7)
+#define SFF8636_VCC_LALARM_STATUS (1 << 6)
+#define SFF8636_VCC_HWARN_STATUS (1 << 5)
+#define SFF8636_VCC_LWARN_STATUS (1 << 4)
+
+/* Channel Monitor Interrupt Flags - 9-21 */
+#define SFF8636_RX_PWR_12_AW_OFFSET 0x09
+#define SFF8636_RX_PWR_1_HALARM (1 << 7)
+#define SFF8636_RX_PWR_1_LALARM (1 << 6)
+#define SFF8636_RX_PWR_1_HWARN (1 << 5)
+#define SFF8636_RX_PWR_1_LWARN (1 << 4)
+#define SFF8636_RX_PWR_2_HALARM (1 << 3)
+#define SFF8636_RX_PWR_2_LALARM (1 << 2)
+#define SFF8636_RX_PWR_2_HWARN (1 << 1)
+#define SFF8636_RX_PWR_2_LWARN (1 << 0)
+
+#define SFF8636_RX_PWR_34_AW_OFFSET 0x0A
+#define SFF8636_RX_PWR_3_HALARM (1 << 7)
+#define SFF8636_RX_PWR_3_LALARM (1 << 6)
+#define SFF8636_RX_PWR_3_HWARN (1 << 5)
+#define SFF8636_RX_PWR_3_LWARN (1 << 4)
+#define SFF8636_RX_PWR_4_HALARM (1 << 3)
+#define SFF8636_RX_PWR_4_LALARM (1 << 2)
+#define SFF8636_RX_PWR_4_HWARN (1 << 1)
+#define SFF8636_RX_PWR_4_LWARN (1 << 0)
+
+#define SFF8636_TX_BIAS_12_AW_OFFSET 0x0B
+#define SFF8636_TX_BIAS_1_HALARM (1 << 7)
+#define SFF8636_TX_BIAS_1_LALARM (1 << 6)
+#define SFF8636_TX_BIAS_1_HWARN (1 << 5)
+#define SFF8636_TX_BIAS_1_LWARN (1 << 4)
+#define SFF8636_TX_BIAS_2_HALARM (1 << 3)
+#define SFF8636_TX_BIAS_2_LALARM (1 << 2)
+#define SFF8636_TX_BIAS_2_HWARN (1 << 1)
+#define SFF8636_TX_BIAS_2_LWARN (1 << 0)
+
+#define SFF8636_TX_BIAS_34_AW_OFFSET 0xC
+#define SFF8636_TX_BIAS_3_HALARM (1 << 7)
+#define SFF8636_TX_BIAS_3_LALARM (1 << 6)
+#define SFF8636_TX_BIAS_3_HWARN (1 << 5)
+#define SFF8636_TX_BIAS_3_LWARN (1 << 4)
+#define SFF8636_TX_BIAS_4_HALARM (1 << 3)
+#define SFF8636_TX_BIAS_4_LALARM (1 << 2)
+#define SFF8636_TX_BIAS_4_HWARN (1 << 1)
+#define SFF8636_TX_BIAS_4_LWARN (1 << 0)
+
+#define SFF8636_TX_PWR_12_AW_OFFSET 0x0D
+#define SFF8636_TX_PWR_1_HALARM (1 << 7)
+#define SFF8636_TX_PWR_1_LALARM (1 << 6)
+#define SFF8636_TX_PWR_1_HWARN (1 << 5)
+#define SFF8636_TX_PWR_1_LWARN (1 << 4)
+#define SFF8636_TX_PWR_2_HALARM (1 << 3)
+#define SFF8636_TX_PWR_2_LALARM (1 << 2)
+#define SFF8636_TX_PWR_2_HWARN (1 << 1)
+#define SFF8636_TX_PWR_2_LWARN (1 << 0)
+
+#define SFF8636_TX_PWR_34_AW_OFFSET 0x0E
+#define SFF8636_TX_PWR_3_HALARM (1 << 7)
+#define SFF8636_TX_PWR_3_LALARM (1 << 6)
+#define SFF8636_TX_PWR_3_HWARN (1 << 5)
+#define SFF8636_TX_PWR_3_LWARN (1 << 4)
+#define SFF8636_TX_PWR_4_HALARM (1 << 3)
+#define SFF8636_TX_PWR_4_LALARM (1 << 2)
+#define SFF8636_TX_PWR_4_HWARN (1 << 1)
+#define SFF8636_TX_PWR_4_LWARN (1 << 0)
+
+/*-----------------------------------------------------------------------
+ * Upper Memory Page 0x11: Optional Page that contains lane dynamic status
+ * bytes.
+ */
+
+/* Media Lane-Specific Flags (Page 0x11) */
+#define CMIS_TX_FAIL_OFFSET 0x87
+#define CMIS_TX_LOS_OFFSET 0x88
+#define CMIS_TX_LOL_OFFSET 0x89
+#define CMIS_TX_EQ_FAIL_OFFSET 0x8a
+#define CMIS_TX_PWR_AW_HALARM_OFFSET 0x8B
+#define CMIS_TX_PWR_AW_LALARM_OFFSET 0x8C
+#define CMIS_TX_PWR_AW_HWARN_OFFSET 0x8D
+#define CMIS_TX_PWR_AW_LWARN_OFFSET 0x8E
+#define CMIS_TX_BIAS_AW_HALARM_OFFSET 0x8F
+#define CMIS_TX_BIAS_AW_LALARM_OFFSET 0x90
+#define CMIS_TX_BIAS_AW_HWARN_OFFSET 0x91
+#define CMIS_TX_BIAS_AW_LWARN_OFFSET 0x92
+#define CMIS_RX_LOS_OFFSET 0x93
+#define CMIS_RX_LOL_OFFSET 0x94
+#define CMIS_RX_PWR_AW_HALARM_OFFSET 0x95
+#define CMIS_RX_PWR_AW_LALARM_OFFSET 0x96
+#define CMIS_RX_PWR_AW_HWARN_OFFSET 0x97
+#define CMIS_RX_PWR_AW_LWARN_OFFSET 0x98
+
+/* Media Lane-Specific Monitors (Page 0x11) */
+#define CMIS_TX_PWR_OFFSET 0x9A
+#define CMIS_TX_BIAS_OFFSET 0xAA
+#define CMIS_RX_PWR_OFFSET 0xBA
+
+#define CMIS_TX_BIAS_MON_MASK 0x01
+#define CMIS_TX_PWR_MON_MASK 0x02
+#define CMIS_RX_PWR_MON_MASK 0x04
+
+#define YESNO(x) (((x) != 0) ? "Yes" : "No")
+#define ONOFF(x) (((x) != 0) ? "On" : "Off")
+
+struct module_aw_mod {
+ enum module_type type;
+ const char *str; /* Human-readable string, null at the end */
+ int offset;
+ __u8 value; /* Alarm is on if (offset & value) != 0. */
+};
+
+struct module_aw_chan {
+ enum module_type type;
+ const char *fmt_str;
+ int offset;
+ int adver_offset; /* In Page 01h. */
+ __u8 adver_value; /* Supported if (offset & value) != 0. */
+};
+
+extern const struct module_aw_mod module_aw_mod_flags[];
+extern const struct module_aw_chan module_aw_chan_flags[];
+
+void module_show_value_with_unit(const __u8 *id, unsigned int reg,
+ const char *name, unsigned int mult,
+ const char *unit);
+void module_show_ascii(const __u8 *id, unsigned int first_reg,
+ unsigned int last_reg, const char *name);
+void module_show_lane_status(const char *name, unsigned int lane_cnt,
+ const char *yes, const char *no,
+ unsigned int value);
+void module_show_oui(const __u8 *id, int id_offset);
+void module_show_identifier(const __u8 *id, int id_offset);
+void module_show_connector(const __u8 *id, int ctor_offset);
+void module_show_mit_compliance(u16 value);
+void module_show_dom_mod_lvl_monitors(const struct sff_diags *sd);
+
+#endif /* MODULE_COMMON_H__ */
diff --git a/netlink/module-eeprom.c b/netlink/module-eeprom.c
index 2b30d04..ce6a7d9 100644
--- a/netlink/module-eeprom.c
+++ b/netlink/module-eeprom.c
@@ -9,7 +9,7 @@
#include <stdio.h>
#include <stddef.h>
-#include "../sff-common.h"
+#include "../module-common.h"
#include "../qsfp.h"
#include "../cmis.h"
#include "../internal.h"
@@ -225,20 +225,20 @@ static int eeprom_parse(struct cmd_context *ctx)
switch (request.data[0]) {
#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
- case SFF8024_ID_GBIC:
- case SFF8024_ID_SOLDERED_MODULE:
- case SFF8024_ID_SFP:
+ case MODULE_ID_GBIC:
+ case MODULE_ID_SOLDERED_MODULE:
+ case MODULE_ID_SFP:
return sff8079_show_all_nl(ctx);
- case SFF8024_ID_QSFP:
- case SFF8024_ID_QSFP28:
- case SFF8024_ID_QSFP_PLUS:
+ case MODULE_ID_QSFP:
+ case MODULE_ID_QSFP28:
+ case MODULE_ID_QSFP_PLUS:
return sff8636_show_all_nl(ctx);
- case SFF8024_ID_QSFP_DD:
- case SFF8024_ID_OSFP:
- case SFF8024_ID_DSFP:
- case SFF8024_ID_QSFP_PLUS_CMIS:
- case SFF8024_ID_SFP_DD_CMIS:
- case SFF8024_ID_SFP_PLUS_CMIS:
+ case MODULE_ID_QSFP_DD:
+ case MODULE_ID_OSFP:
+ case MODULE_ID_DSFP:
+ case MODULE_ID_QSFP_PLUS_CMIS:
+ case MODULE_ID_SFP_DD_CMIS:
+ case MODULE_ID_SFP_PLUS_CMIS:
return cmis_show_all_nl(ctx);
#endif
default:
diff --git a/qsfp.c b/qsfp.c
index a3a919d..6d774f8 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -57,7 +57,7 @@
#include <math.h>
#include <errno.h>
#include "internal.h"
-#include "sff-common.h"
+#include "module-common.h"
#include "qsfp.h"
#include "cmis.h"
#include "netlink/extapi.h"
@@ -75,143 +75,9 @@ struct sff8636_memory_map {
#define MAX_DESC_SIZE 42
-static struct sff8636_aw_flags {
- const char *str; /* Human-readable string, null at the end */
- int offset;
- __u8 value; /* Alarm is on if (offset & value) != 0. */
-} sff8636_aw_flags[] = {
- { "Laser bias current high alarm (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_1_HALARM) },
- { "Laser bias current low alarm (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_1_LALARM) },
- { "Laser bias current high warning (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_1_HWARN) },
- { "Laser bias current low warning (Chan 1)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_1_LWARN) },
-
- { "Laser bias current high alarm (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_2_HALARM) },
- { "Laser bias current low alarm (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_2_LALARM) },
- { "Laser bias current high warning (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_2_HWARN) },
- { "Laser bias current low warning (Chan 2)",
- SFF8636_TX_BIAS_12_AW_OFFSET, (SFF8636_TX_BIAS_2_LWARN) },
-
- { "Laser bias current high alarm (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_3_HALARM) },
- { "Laser bias current low alarm (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_3_LALARM) },
- { "Laser bias current high warning (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_3_HWARN) },
- { "Laser bias current low warning (Chan 3)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_3_LWARN) },
-
- { "Laser bias current high alarm (Chan 4)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_4_HALARM) },
- { "Laser bias current low alarm (Chan 4)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_4_LALARM) },
- { "Laser bias current high warning (Chan 4)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_4_HWARN) },
- { "Laser bias current low warning (Chan 4)",
- SFF8636_TX_BIAS_34_AW_OFFSET, (SFF8636_TX_BIAS_4_LWARN) },
-
- { "Module temperature high alarm",
- SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_HALARM_STATUS) },
- { "Module temperature low alarm",
- SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_LALARM_STATUS) },
- { "Module temperature high warning",
- SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_HWARN_STATUS) },
- { "Module temperature low warning",
- SFF8636_TEMP_AW_OFFSET, (SFF8636_TEMP_LWARN_STATUS) },
-
- { "Module voltage high alarm",
- SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_HALARM_STATUS) },
- { "Module voltage low alarm",
- SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_LALARM_STATUS) },
- { "Module voltage high warning",
- SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_HWARN_STATUS) },
- { "Module voltage low warning",
- SFF8636_VCC_AW_OFFSET, (SFF8636_VCC_LWARN_STATUS) },
-
- { "Laser tx power high alarm (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_1_HALARM) },
- { "Laser tx power low alarm (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_1_LALARM) },
- { "Laser tx power high warning (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_1_HWARN) },
- { "Laser tx power low warning (Channel 1)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_1_LWARN) },
-
- { "Laser tx power high alarm (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_2_HALARM) },
- { "Laser tx power low alarm (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_2_LALARM) },
- { "Laser tx power high warning (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_2_HWARN) },
- { "Laser tx power low warning (Channel 2)",
- SFF8636_TX_PWR_12_AW_OFFSET, (SFF8636_TX_PWR_2_LWARN) },
-
- { "Laser tx power high alarm (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_3_HALARM) },
- { "Laser tx power low alarm (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_3_LALARM) },
- { "Laser tx power high warning (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_3_HWARN) },
- { "Laser tx power low warning (Channel 3)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_3_LWARN) },
-
- { "Laser tx power high alarm (Channel 4)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_4_HALARM) },
- { "Laser tx power low alarm (Channel 4)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_4_LALARM) },
- { "Laser tx power high warning (Channel 4)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_4_HWARN) },
- { "Laser tx power low warning (Channel 4)",
- SFF8636_TX_PWR_34_AW_OFFSET, (SFF8636_TX_PWR_4_LWARN) },
-
- { "Laser rx power high alarm (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_1_HALARM) },
- { "Laser rx power low alarm (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_1_LALARM) },
- { "Laser rx power high warning (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_1_HWARN) },
- { "Laser rx power low warning (Channel 1)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_1_LWARN) },
-
- { "Laser rx power high alarm (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_2_HALARM) },
- { "Laser rx power low alarm (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_2_LALARM) },
- { "Laser rx power high warning (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_2_HWARN) },
- { "Laser rx power low warning (Channel 2)",
- SFF8636_RX_PWR_12_AW_OFFSET, (SFF8636_RX_PWR_2_LWARN) },
-
- { "Laser rx power high alarm (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_3_HALARM) },
- { "Laser rx power low alarm (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_3_LALARM) },
- { "Laser rx power high warning (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_3_HWARN) },
- { "Laser rx power low warning (Channel 3)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_3_LWARN) },
-
- { "Laser rx power high alarm (Channel 4)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_4_HALARM) },
- { "Laser rx power low alarm (Channel 4)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_4_LALARM) },
- { "Laser rx power high warning (Channel 4)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_4_HWARN) },
- { "Laser rx power low warning (Channel 4)",
- SFF8636_RX_PWR_34_AW_OFFSET, (SFF8636_RX_PWR_4_LWARN) },
-
- { NULL, 0, 0 },
-};
-
static void sff8636_show_identifier(const struct sff8636_memory_map *map)
{
- sff8024_show_identifier(map->lower_memory, SFF8636_ID_OFFSET);
+ module_show_identifier(map->lower_memory, SFF8636_ID_OFFSET);
}
static void sff8636_show_ext_identifier(const struct sff8636_memory_map *map)
@@ -278,7 +144,7 @@ static void sff8636_show_ext_identifier(const struct sff8636_memory_map *map)
static void sff8636_show_connector(const struct sff8636_memory_map *map)
{
- sff8024_show_connector(map->page_00h, SFF8636_CTOR_OFFSET);
+ module_show_connector(map->page_00h, SFF8636_CTOR_OFFSET);
}
static void sff8636_show_transceiver(const struct sff8636_memory_map *map)
@@ -624,64 +490,12 @@ static void sff8636_show_rate_identifier(const struct sff8636_memory_map *map)
static void
sff8636_show_wavelength_or_copper_compliance(const struct sff8636_memory_map *map)
{
- printf("\t%-41s : 0x%02x", "Transmitter technology",
- map->page_00h[SFF8636_DEVICE_TECH_OFFSET] &
- SFF8636_TRANS_TECH_MASK);
-
- switch (map->page_00h[SFF8636_DEVICE_TECH_OFFSET] &
- SFF8636_TRANS_TECH_MASK) {
- case SFF8636_TRANS_850_VCSEL:
- printf(" (850 nm VCSEL)\n");
- break;
- case SFF8636_TRANS_1310_VCSEL:
- printf(" (1310 nm VCSEL)\n");
- break;
- case SFF8636_TRANS_1550_VCSEL:
- printf(" (1550 nm VCSEL)\n");
- break;
- case SFF8636_TRANS_1310_FP:
- printf(" (1310 nm FP)\n");
- break;
- case SFF8636_TRANS_1310_DFB:
- printf(" (1310 nm DFB)\n");
- break;
- case SFF8636_TRANS_1550_DFB:
- printf(" (1550 nm DFB)\n");
- break;
- case SFF8636_TRANS_1310_EML:
- printf(" (1310 nm EML)\n");
- break;
- case SFF8636_TRANS_1550_EML:
- printf(" (1550 nm EML)\n");
- break;
- case SFF8636_TRANS_OTHERS:
- printf(" (Others/Undefined)\n");
- break;
- case SFF8636_TRANS_1490_DFB:
- printf(" (1490 nm DFB)\n");
- break;
- case SFF8636_TRANS_COPPER_PAS_UNEQUAL:
- printf(" (Copper cable unequalized)\n");
- break;
- case SFF8636_TRANS_COPPER_PAS_EQUAL:
- printf(" (Copper cable passive equalized)\n");
- break;
- case SFF8636_TRANS_COPPER_LNR_FAR_EQUAL:
- printf(" (Copper cable, near and far end limiting active equalizers)\n");
- break;
- case SFF8636_TRANS_COPPER_FAR_EQUAL:
- printf(" (Copper cable, far end limiting active equalizers)\n");
- break;
- case SFF8636_TRANS_COPPER_NEAR_EQUAL:
- printf(" (Copper cable, near end limiting active equalizers)\n");
- break;
- case SFF8636_TRANS_COPPER_LNR_EQUAL:
- printf(" (Copper cable, linear active equalizers)\n");
- break;
- }
+ u16 value = map->page_00h[SFF8636_DEVICE_TECH_OFFSET] &
+ SFF8636_TRANS_TECH_MASK;
- if ((map->page_00h[SFF8636_DEVICE_TECH_OFFSET] &
- SFF8636_TRANS_TECH_MASK) >= SFF8636_TRANS_COPPER_PAS_UNEQUAL) {
+ module_show_mit_compliance(value);
+
+ if (value >= SFF8636_TRANS_COPPER_PAS_UNEQUAL) {
printf("\t%-41s : %udb\n", "Attenuation at 2.5GHz",
map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET]);
printf("\t%-41s : %udb\n", "Attenuation at 5.0GHz",
@@ -823,8 +637,7 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
sff8636_dom_parse(map, &sd);
- PRINT_TEMP("Module temperature", sd.sfp_temp[MCURR]);
- PRINT_VCC("Module voltage", sd.sfp_voltage[MCURR]);
+ module_show_dom_mod_lvl_monitors(&sd);
/*
* SFF-8636/8436 spec is not clear whether RX power/ TX bias
@@ -862,10 +675,21 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
}
if (sd.supports_alarms) {
- for (i = 0; sff8636_aw_flags[i].str; ++i) {
- printf("\t%-41s : %s\n", sff8636_aw_flags[i].str,
- map->lower_memory[sff8636_aw_flags[i].offset]
- & sff8636_aw_flags[i].value ? "On" : "Off");
+ 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");
+ }
+ for (i = 0; module_aw_mod_flags[i].str; ++i) {
+ if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
+ printf("\t%-41s : %s\n",
+ module_aw_mod_flags[i].str,
+ (map->lower_memory[module_aw_mod_flags[i].offset]
+ & module_aw_mod_flags[i].value) ?
+ "On" : "Off");
}
sff_show_thresholds(sd);
@@ -879,26 +703,27 @@ static void sff8636_show_signals(const struct sff8636_memory_map *map)
/* There appears to be no Rx LOS support bit, use Tx for both */
if (map->page_00h[SFF8636_OPTION_4_OFFSET] & SFF8636_O4_TX_LOS) {
v = map->lower_memory[SFF8636_LOS_AW_OFFSET] & 0xf;
- sff_show_lane_status("Rx loss of signal", 4, "Yes", "No", v);
+ module_show_lane_status("Rx loss of signal", 4, "Yes", "No", v);
v = map->lower_memory[SFF8636_LOS_AW_OFFSET] >> 4;
- sff_show_lane_status("Tx loss of signal", 4, "Yes", "No", v);
+ module_show_lane_status("Tx loss of signal", 4, "Yes", "No", v);
}
v = map->lower_memory[SFF8636_LOL_AW_OFFSET] & 0xf;
if (map->page_00h[SFF8636_OPTION_3_OFFSET] & SFF8636_O3_RX_LOL)
- sff_show_lane_status("Rx loss of lock", 4, "Yes", "No", v);
+ module_show_lane_status("Rx loss of lock", 4, "Yes", "No", v);
v = map->lower_memory[SFF8636_LOL_AW_OFFSET] >> 4;
if (map->page_00h[SFF8636_OPTION_3_OFFSET] & SFF8636_O3_TX_LOL)
- sff_show_lane_status("Tx loss of lock", 4, "Yes", "No", v);
+ module_show_lane_status("Tx loss of lock", 4, "Yes", "No", v);
v = map->lower_memory[SFF8636_FAULT_AW_OFFSET] & 0xf;
if (map->page_00h[SFF8636_OPTION_4_OFFSET] & SFF8636_O4_TX_FAULT)
- sff_show_lane_status("Tx fault", 4, "Yes", "No", v);
+ module_show_lane_status("Tx fault", 4, "Yes", "No", v);
v = map->lower_memory[SFF8636_FAULT_AW_OFFSET] >> 4;
if (map->page_00h[SFF8636_OPTION_2_OFFSET] & SFF8636_O2_TX_EQ_AUTO)
- sff_show_lane_status("Tx adaptive eq fault", 4, "Yes", "No", v);
+ module_show_lane_status("Tx adaptive eq fault", 4, "Yes", "No",
+ v);
}
static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
@@ -907,31 +732,31 @@ static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
sff8636_show_connector(map);
sff8636_show_transceiver(map);
sff8636_show_encoding(map);
- sff_show_value_with_unit(map->page_00h, SFF8636_BR_NOMINAL_OFFSET,
- "BR, Nominal", 100, "Mbps");
+ module_show_value_with_unit(map->page_00h, SFF8636_BR_NOMINAL_OFFSET,
+ "BR, Nominal", 100, "Mbps");
sff8636_show_rate_identifier(map);
- sff_show_value_with_unit(map->page_00h, SFF8636_SM_LEN_OFFSET,
- "Length (SMF,km)", 1, "km");
- sff_show_value_with_unit(map->page_00h, SFF8636_OM3_LEN_OFFSET,
- "Length (OM3 50um)", 2, "m");
- sff_show_value_with_unit(map->page_00h, SFF8636_OM2_LEN_OFFSET,
- "Length (OM2 50um)", 1, "m");
- sff_show_value_with_unit(map->page_00h, SFF8636_OM1_LEN_OFFSET,
- "Length (OM1 62.5um)", 1, "m");
- sff_show_value_with_unit(map->page_00h, SFF8636_CBL_LEN_OFFSET,
- "Length (Copper or Active cable)", 1, "m");
+ module_show_value_with_unit(map->page_00h, SFF8636_SM_LEN_OFFSET,
+ "Length (SMF,km)", 1, "km");
+ module_show_value_with_unit(map->page_00h, SFF8636_OM3_LEN_OFFSET,
+ "Length (OM3 50um)", 2, "m");
+ module_show_value_with_unit(map->page_00h, SFF8636_OM2_LEN_OFFSET,
+ "Length (OM2 50um)", 1, "m");
+ module_show_value_with_unit(map->page_00h, SFF8636_OM1_LEN_OFFSET,
+ "Length (OM1 62.5um)", 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);
- sff_show_ascii(map->page_00h, SFF8636_VENDOR_NAME_START_OFFSET,
- SFF8636_VENDOR_NAME_END_OFFSET, "Vendor name");
- sff8024_show_oui(map->page_00h, SFF8636_VENDOR_OUI_OFFSET);
- sff_show_ascii(map->page_00h, SFF8636_VENDOR_PN_START_OFFSET,
- SFF8636_VENDOR_PN_END_OFFSET, "Vendor PN");
- sff_show_ascii(map->page_00h, SFF8636_VENDOR_REV_START_OFFSET,
- SFF8636_VENDOR_REV_END_OFFSET, "Vendor rev");
- sff_show_ascii(map->page_00h, SFF8636_VENDOR_SN_START_OFFSET,
- SFF8636_VENDOR_SN_END_OFFSET, "Vendor SN");
- sff_show_ascii(map->page_00h, SFF8636_DATE_YEAR_OFFSET,
- SFF8636_DATE_VENDOR_LOT_OFFSET + 1, "Date code");
+ module_show_ascii(map->page_00h, SFF8636_VENDOR_NAME_START_OFFSET,
+ SFF8636_VENDOR_NAME_END_OFFSET, "Vendor name");
+ module_show_oui(map->page_00h, SFF8636_VENDOR_OUI_OFFSET);
+ module_show_ascii(map->page_00h, SFF8636_VENDOR_PN_START_OFFSET,
+ SFF8636_VENDOR_PN_END_OFFSET, "Vendor PN");
+ module_show_ascii(map->page_00h, SFF8636_VENDOR_REV_START_OFFSET,
+ SFF8636_VENDOR_REV_END_OFFSET, "Vendor rev");
+ module_show_ascii(map->page_00h, SFF8636_VENDOR_SN_START_OFFSET,
+ SFF8636_VENDOR_SN_END_OFFSET, "Vendor SN");
+ module_show_ascii(map->page_00h, SFF8636_DATE_YEAR_OFFSET,
+ SFF8636_DATE_VENDOR_LOT_OFFSET + 1, "Date code");
sff_show_revision_compliance(map->lower_memory,
SFF8636_REV_COMPLIANCE_OFFSET);
sff8636_show_signals(map);
@@ -941,9 +766,9 @@ static void sff8636_show_all_common(const struct sff8636_memory_map *map)
{
sff8636_show_identifier(map);
switch (map->lower_memory[SFF8636_ID_OFFSET]) {
- case SFF8024_ID_QSFP:
- case SFF8024_ID_QSFP_PLUS:
- case SFF8024_ID_QSFP28:
+ case MODULE_ID_QSFP:
+ case MODULE_ID_QSFP_PLUS:
+ case MODULE_ID_QSFP28:
sff8636_show_page_zero(map);
sff8636_show_dom(map);
break;
@@ -978,12 +803,12 @@ void sff8636_show_all_ioctl(const __u8 *id, __u32 eeprom_len)
struct sff8636_memory_map map = {};
switch (id[SFF8636_ID_OFFSET]) {
- case SFF8024_ID_QSFP_DD:
- case SFF8024_ID_OSFP:
- case SFF8024_ID_DSFP:
- case SFF8024_ID_QSFP_PLUS_CMIS:
- case SFF8024_ID_SFP_DD_CMIS:
- case SFF8024_ID_SFP_PLUS_CMIS:
+ case MODULE_ID_QSFP_DD:
+ case MODULE_ID_OSFP:
+ case MODULE_ID_DSFP:
+ case MODULE_ID_QSFP_PLUS_CMIS:
+ case MODULE_ID_SFP_DD_CMIS:
+ case MODULE_ID_SFP_PLUS_CMIS:
cmis_show_all_ioctl(id);
break;
default:
diff --git a/qsfp.h b/qsfp.h
index 9f0cb0f..b899d4a 100644
--- a/qsfp.h
+++ b/qsfp.h
@@ -57,80 +57,6 @@
#define SFF8636_LOL_AW_OFFSET 0x05
-/* Module Monitor Interrupt Flags - 6-8 */
-#define SFF8636_TEMP_AW_OFFSET 0x06
-#define SFF8636_TEMP_HALARM_STATUS (1 << 7)
-#define SFF8636_TEMP_LALARM_STATUS (1 << 6)
-#define SFF8636_TEMP_HWARN_STATUS (1 << 5)
-#define SFF8636_TEMP_LWARN_STATUS (1 << 4)
-
-#define SFF8636_VCC_AW_OFFSET 0x07
-#define SFF8636_VCC_HALARM_STATUS (1 << 7)
-#define SFF8636_VCC_LALARM_STATUS (1 << 6)
-#define SFF8636_VCC_HWARN_STATUS (1 << 5)
-#define SFF8636_VCC_LWARN_STATUS (1 << 4)
-
-/* Channel Monitor Interrupt Flags - 9-21 */
-#define SFF8636_RX_PWR_12_AW_OFFSET 0x09
-#define SFF8636_RX_PWR_1_HALARM (1 << 7)
-#define SFF8636_RX_PWR_1_LALARM (1 << 6)
-#define SFF8636_RX_PWR_1_HWARN (1 << 5)
-#define SFF8636_RX_PWR_1_LWARN (1 << 4)
-#define SFF8636_RX_PWR_2_HALARM (1 << 3)
-#define SFF8636_RX_PWR_2_LALARM (1 << 2)
-#define SFF8636_RX_PWR_2_HWARN (1 << 1)
-#define SFF8636_RX_PWR_2_LWARN (1 << 0)
-
-#define SFF8636_RX_PWR_34_AW_OFFSET 0x0A
-#define SFF8636_RX_PWR_3_HALARM (1 << 7)
-#define SFF8636_RX_PWR_3_LALARM (1 << 6)
-#define SFF8636_RX_PWR_3_HWARN (1 << 5)
-#define SFF8636_RX_PWR_3_LWARN (1 << 4)
-#define SFF8636_RX_PWR_4_HALARM (1 << 3)
-#define SFF8636_RX_PWR_4_LALARM (1 << 2)
-#define SFF8636_RX_PWR_4_HWARN (1 << 1)
-#define SFF8636_RX_PWR_4_LWARN (1 << 0)
-
-#define SFF8636_TX_BIAS_12_AW_OFFSET 0x0B
-#define SFF8636_TX_BIAS_1_HALARM (1 << 7)
-#define SFF8636_TX_BIAS_1_LALARM (1 << 6)
-#define SFF8636_TX_BIAS_1_HWARN (1 << 5)
-#define SFF8636_TX_BIAS_1_LWARN (1 << 4)
-#define SFF8636_TX_BIAS_2_HALARM (1 << 3)
-#define SFF8636_TX_BIAS_2_LALARM (1 << 2)
-#define SFF8636_TX_BIAS_2_HWARN (1 << 1)
-#define SFF8636_TX_BIAS_2_LWARN (1 << 0)
-
-#define SFF8636_TX_BIAS_34_AW_OFFSET 0xC
-#define SFF8636_TX_BIAS_3_HALARM (1 << 7)
-#define SFF8636_TX_BIAS_3_LALARM (1 << 6)
-#define SFF8636_TX_BIAS_3_HWARN (1 << 5)
-#define SFF8636_TX_BIAS_3_LWARN (1 << 4)
-#define SFF8636_TX_BIAS_4_HALARM (1 << 3)
-#define SFF8636_TX_BIAS_4_LALARM (1 << 2)
-#define SFF8636_TX_BIAS_4_HWARN (1 << 1)
-#define SFF8636_TX_BIAS_4_LWARN (1 << 0)
-
-#define SFF8636_TX_PWR_12_AW_OFFSET 0x0D
-#define SFF8636_TX_PWR_1_HALARM (1 << 7)
-#define SFF8636_TX_PWR_1_LALARM (1 << 6)
-#define SFF8636_TX_PWR_1_HWARN (1 << 5)
-#define SFF8636_TX_PWR_1_LWARN (1 << 4)
-#define SFF8636_TX_PWR_2_HALARM (1 << 3)
-#define SFF8636_TX_PWR_2_LALARM (1 << 2)
-#define SFF8636_TX_PWR_2_HWARN (1 << 1)
-#define SFF8636_TX_PWR_2_LWARN (1 << 0)
-
-#define SFF8636_TX_PWR_34_AW_OFFSET 0x0E
-#define SFF8636_TX_PWR_3_HALARM (1 << 7)
-#define SFF8636_TX_PWR_3_LALARM (1 << 6)
-#define SFF8636_TX_PWR_3_HWARN (1 << 5)
-#define SFF8636_TX_PWR_3_LWARN (1 << 4)
-#define SFF8636_TX_PWR_4_HALARM (1 << 3)
-#define SFF8636_TX_PWR_4_LALARM (1 << 2)
-#define SFF8636_TX_PWR_4_HWARN (1 << 1)
-#define SFF8636_TX_PWR_4_LWARN (1 << 0)
-
/* Module Monitoring Values - 22-33 */
#define SFF8636_TEMP_CURR 0x16
#define SFF8636_TEMP_MSB_OFFSET 0x16
@@ -381,40 +307,6 @@
/* Device Technology - 147 */
#define SFF8636_DEVICE_TECH_OFFSET 0x93
-/* Transmitter Technology */
-#define SFF8636_TRANS_TECH_MASK 0xF0
-/* Copper cable, linear active equalizers */
-#define SFF8636_TRANS_COPPER_LNR_EQUAL (15 << 4)
-/* Copper cable, near end limiting active equalizers */
-#define SFF8636_TRANS_COPPER_NEAR_EQUAL (14 << 4)
-/* Copper cable, far end limiting active equalizers */
-#define SFF8636_TRANS_COPPER_FAR_EQUAL (13 << 4)
-/* Copper cable, near & far end limiting active equalizers */
-#define SFF8636_TRANS_COPPER_LNR_FAR_EQUAL (12 << 4)
-/* Copper cable, passive equalized */
-#define SFF8636_TRANS_COPPER_PAS_EQUAL (11 << 4)
-/* Copper cable, unequalized */
-#define SFF8636_TRANS_COPPER_PAS_UNEQUAL (10 << 4)
-/* 1490 nm DFB */
-#define SFF8636_TRANS_1490_DFB (9 << 4)
-/* Others */
-#define SFF8636_TRANS_OTHERS (8 << 4)
-/* 1550 nm EML */
-#define SFF8636_TRANS_1550_EML (7 << 4)
-/* 1310 nm EML */
-#define SFF8636_TRANS_1310_EML (6 << 4)
-/* 1550 nm DFB */
-#define SFF8636_TRANS_1550_DFB (5 << 4)
-/* 1310 nm DFB */
-#define SFF8636_TRANS_1310_DFB (4 << 4)
-/* 1310 nm FP */
-#define SFF8636_TRANS_1310_FP (3 << 4)
-/* 1550 nm VCSEL */
-#define SFF8636_TRANS_1550_VCSEL (2 << 4)
-/* 1310 nm VCSEL */
-#define SFF8636_TRANS_1310_VCSEL (1 << 4)
-/* 850 nm VCSEL */
-#define SFF8636_TRANS_850_VCSEL (0 << 4)
/* Active/No wavelength control */
#define SFF8636_DEV_TECH_ACTIVE_WAVE_LEN (1 << 3)
diff --git a/sff-common.c b/sff-common.c
index a412a6e..6712b3e 100644
--- a/sff-common.c
+++ b/sff-common.c
@@ -29,233 +29,6 @@ double convert_mw_to_dbm(double mw)
return (10. * log10(mw / 1000.)) + 30.;
}
-void sff_show_value_with_unit(const __u8 *id, unsigned int reg,
- const char *name, unsigned int mult,
- const char *unit)
-{
- unsigned int val = id[reg];
-
- printf("\t%-41s : %u%s\n", name, val * mult, unit);
-}
-
-void sff_show_ascii(const __u8 *id, unsigned int first_reg,
- unsigned int last_reg, const char *name)
-{
- unsigned int reg, val;
-
- printf("\t%-41s : ", name);
- while (first_reg <= last_reg && id[last_reg] == ' ')
- last_reg--;
- for (reg = first_reg; reg <= last_reg; reg++) {
- val = id[reg];
- putchar(((val >= 32) && (val <= 126)) ? val : '_');
- }
- printf("\n");
-}
-
-void sff_show_lane_status(const char *name, unsigned int lane_cnt,
- const char *yes, const char *no, unsigned int value)
-{
- printf("\t%-41s : ", name);
- if (!value) {
- printf("None\n");
- return;
- }
-
- printf("[");
- while (lane_cnt--) {
- printf(" %s%c", value & 1 ? yes : no, lane_cnt ? ',': ' ');
- value >>= 1;
- }
- printf("]\n");
-}
-
-void sff8024_show_oui(const __u8 *id, int id_offset)
-{
- printf("\t%-41s : %02x:%02x:%02x\n", "Vendor OUI",
- id[id_offset], id[(id_offset) + 1],
- id[(id_offset) + 2]);
-}
-
-void sff8024_show_identifier(const __u8 *id, int id_offset)
-{
- printf("\t%-41s : 0x%02x", "Identifier", id[id_offset]);
- switch (id[id_offset]) {
- case SFF8024_ID_UNKNOWN:
- printf(" (no module present, unknown, or unspecified)\n");
- break;
- case SFF8024_ID_GBIC:
- printf(" (GBIC)\n");
- break;
- case SFF8024_ID_SOLDERED_MODULE:
- printf(" (module soldered to motherboard)\n");
- break;
- case SFF8024_ID_SFP:
- printf(" (SFP)\n");
- break;
- case SFF8024_ID_300_PIN_XBI:
- printf(" (300 pin XBI)\n");
- break;
- case SFF8024_ID_XENPAK:
- printf(" (XENPAK)\n");
- break;
- case SFF8024_ID_XFP:
- printf(" (XFP)\n");
- break;
- case SFF8024_ID_XFF:
- printf(" (XFF)\n");
- break;
- case SFF8024_ID_XFP_E:
- printf(" (XFP-E)\n");
- break;
- case SFF8024_ID_XPAK:
- printf(" (XPAK)\n");
- break;
- case SFF8024_ID_X2:
- printf(" (X2)\n");
- break;
- case SFF8024_ID_DWDM_SFP:
- printf(" (DWDM-SFP)\n");
- break;
- case SFF8024_ID_QSFP:
- printf(" (QSFP)\n");
- break;
- case SFF8024_ID_QSFP_PLUS:
- printf(" (QSFP+)\n");
- break;
- case SFF8024_ID_CXP:
- printf(" (CXP)\n");
- break;
- case SFF8024_ID_HD4X:
- printf(" (Shielded Mini Multilane HD 4X)\n");
- break;
- case SFF8024_ID_HD8X:
- printf(" (Shielded Mini Multilane HD 8X)\n");
- break;
- case SFF8024_ID_QSFP28:
- printf(" (QSFP28)\n");
- break;
- case SFF8024_ID_CXP2:
- printf(" (CXP2/CXP28)\n");
- break;
- case SFF8024_ID_CDFP:
- printf(" (CDFP Style 1/Style 2)\n");
- break;
- case SFF8024_ID_HD4X_FANOUT:
- printf(" (Shielded Mini Multilane HD 4X Fanout Cable)\n");
- break;
- case SFF8024_ID_HD8X_FANOUT:
- printf(" (Shielded Mini Multilane HD 8X Fanout Cable)\n");
- break;
- case SFF8024_ID_CDFP_S3:
- printf(" (CDFP Style 3)\n");
- break;
- case SFF8024_ID_MICRO_QSFP:
- printf(" (microQSFP)\n");
- break;
- case SFF8024_ID_QSFP_DD:
- printf(" (QSFP-DD Double Density 8X Pluggable Transceiver (INF-8628))\n");
- break;
- case SFF8024_ID_OSFP:
- printf(" (OSFP 8X Pluggable Transceiver)\n");
- break;
- case SFF8024_ID_DSFP:
- printf(" (DSFP Dual Small Form Factor Pluggable Transceiver)\n");
- break;
- case SFF8024_ID_QSFP_PLUS_CMIS:
- printf(" (QSFP+ or later with Common Management Interface Specification (CMIS))\n");
- break;
- case SFF8024_ID_SFP_DD_CMIS:
- printf(" (SFP-DD Double Density 2X Pluggable Transceiver with Common Management Interface Specification (CMIS))\n");
- break;
- case SFF8024_ID_SFP_PLUS_CMIS:
- printf(" (SFP+ and later with Common Management Interface Specification (CMIS))\n");
- break;
- default:
- printf(" (reserved or unknown)\n");
- break;
- }
-}
-
-void sff8024_show_connector(const __u8 *id, int ctor_offset)
-{
- printf("\t%-41s : 0x%02x", "Connector", id[ctor_offset]);
- switch (id[ctor_offset]) {
- case SFF8024_CTOR_UNKNOWN:
- printf(" (unknown or unspecified)\n");
- break;
- case SFF8024_CTOR_SC:
- printf(" (SC)\n");
- break;
- case SFF8024_CTOR_FC_STYLE_1:
- printf(" (Fibre Channel Style 1 copper)\n");
- break;
- case SFF8024_CTOR_FC_STYLE_2:
- printf(" (Fibre Channel Style 2 copper)\n");
- break;
- case SFF8024_CTOR_BNC_TNC:
- printf(" (BNC/TNC)\n");
- break;
- case SFF8024_CTOR_FC_COAX:
- printf(" (Fibre Channel coaxial headers)\n");
- break;
- case SFF8024_CTOR_FIBER_JACK:
- printf(" (FibreJack)\n");
- break;
- case SFF8024_CTOR_LC:
- printf(" (LC)\n");
- break;
- case SFF8024_CTOR_MT_RJ:
- printf(" (MT-RJ)\n");
- break;
- case SFF8024_CTOR_MU:
- printf(" (MU)\n");
- break;
- case SFF8024_CTOR_SG:
- printf(" (SG)\n");
- break;
- case SFF8024_CTOR_OPT_PT:
- printf(" (Optical pigtail)\n");
- break;
- case SFF8024_CTOR_MPO:
- printf(" (MPO Parallel Optic)\n");
- break;
- case SFF8024_CTOR_MPO_2:
- printf(" (MPO Parallel Optic - 2x16)\n");
- break;
- case SFF8024_CTOR_HSDC_II:
- printf(" (HSSDC II)\n");
- break;
- case SFF8024_CTOR_COPPER_PT:
- printf(" (Copper pigtail)\n");
- break;
- case SFF8024_CTOR_RJ45:
- printf(" (RJ45)\n");
- break;
- case SFF8024_CTOR_NO_SEPARABLE:
- printf(" (No separable connector)\n");
- break;
- case SFF8024_CTOR_MXC_2x16:
- printf(" (MXC 2x16)\n");
- break;
- case SFF8024_CTOR_CS_OPTICAL:
- printf(" (CS optical connector)\n");
- break;
- case SFF8024_CTOR_CS_OPTICAL_MINI:
- printf(" (Mini CS optical connector)\n");
- break;
- case SFF8024_CTOR_MPO_2X12:
- printf(" (MPO 2x12)\n");
- break;
- case SFF8024_CTOR_MPO_1X16:
- printf(" (MPO 1x16)\n");
- break;
- default:
- printf(" (reserved or unknown)\n");
- break;
- }
-}
-
void sff8024_show_encoding(const __u8 *id, int encoding_offset, int sff_type)
{
printf("\t%-41s : 0x%02x", "Encoding", id[encoding_offset]);
diff --git a/sff-common.h b/sff-common.h
index 899dc5b..34f1275 100644
--- a/sff-common.h
+++ b/sff-common.h
@@ -36,73 +36,6 @@
#define SFF8636_REV_8636_20 0x06
#define SFF8636_REV_8636_27 0x07
-#define SFF8024_ID_OFFSET 0x00
-#define SFF8024_ID_UNKNOWN 0x00
-#define SFF8024_ID_GBIC 0x01
-#define SFF8024_ID_SOLDERED_MODULE 0x02
-#define SFF8024_ID_SFP 0x03
-#define SFF8024_ID_300_PIN_XBI 0x04
-#define SFF8024_ID_XENPAK 0x05
-#define SFF8024_ID_XFP 0x06
-#define SFF8024_ID_XFF 0x07
-#define SFF8024_ID_XFP_E 0x08
-#define SFF8024_ID_XPAK 0x09
-#define SFF8024_ID_X2 0x0A
-#define SFF8024_ID_DWDM_SFP 0x0B
-#define SFF8024_ID_QSFP 0x0C
-#define SFF8024_ID_QSFP_PLUS 0x0D
-#define SFF8024_ID_CXP 0x0E
-#define SFF8024_ID_HD4X 0x0F
-#define SFF8024_ID_HD8X 0x10
-#define SFF8024_ID_QSFP28 0x11
-#define SFF8024_ID_CXP2 0x12
-#define SFF8024_ID_CDFP 0x13
-#define SFF8024_ID_HD4X_FANOUT 0x14
-#define SFF8024_ID_HD8X_FANOUT 0x15
-#define SFF8024_ID_CDFP_S3 0x16
-#define SFF8024_ID_MICRO_QSFP 0x17
-#define SFF8024_ID_QSFP_DD 0x18
-#define SFF8024_ID_OSFP 0x19
-#define SFF8024_ID_DSFP 0x1B
-#define SFF8024_ID_QSFP_PLUS_CMIS 0x1E
-#define SFF8024_ID_SFP_DD_CMIS 0x1F
-#define SFF8024_ID_SFP_PLUS_CMIS 0x20
-#define SFF8024_ID_LAST SFF8024_ID_SFP_PLUS_CMIS
-#define SFF8024_ID_UNALLOCATED_LAST 0x7F
-#define SFF8024_ID_VENDOR_START 0x80
-#define SFF8024_ID_VENDOR_LAST 0xFF
-
-#define SFF8024_CTOR_UNKNOWN 0x00
-#define SFF8024_CTOR_SC 0x01
-#define SFF8024_CTOR_FC_STYLE_1 0x02
-#define SFF8024_CTOR_FC_STYLE_2 0x03
-#define SFF8024_CTOR_BNC_TNC 0x04
-#define SFF8024_CTOR_FC_COAX 0x05
-#define SFF8024_CTOR_FIBER_JACK 0x06
-#define SFF8024_CTOR_LC 0x07
-#define SFF8024_CTOR_MT_RJ 0x08
-#define SFF8024_CTOR_MU 0x09
-#define SFF8024_CTOR_SG 0x0A
-#define SFF8024_CTOR_OPT_PT 0x0B
-#define SFF8024_CTOR_MPO 0x0C
-#define SFF8024_CTOR_MPO_2 0x0D
-/* 0E-1Fh --- Reserved */
-#define SFF8024_CTOR_HSDC_II 0x20
-#define SFF8024_CTOR_COPPER_PT 0x21
-#define SFF8024_CTOR_RJ45 0x22
-#define SFF8024_CTOR_NO_SEPARABLE 0x23
-#define SFF8024_CTOR_MXC_2x16 0x24
-#define SFF8024_CTOR_CS_OPTICAL 0x25
-#define SFF8024_CTOR_CS_OPTICAL_MINI 0x26
-#define SFF8024_CTOR_MPO_2X12 0x27
-#define SFF8024_CTOR_MPO_1X16 0x28
-#define SFF8024_CTOR_LAST SFF8024_CTOR_MPO_1X16
-
-#define SFF8024_CTOR_NO_SEP_QSFP_DD 0x6F
-#define SFF8024_CTOR_UNALLOCATED_LAST 0x7F
-#define SFF8024_CTOR_VENDOR_START 0x80
-#define SFF8024_CTOR_VENDOR_LAST 0xFF
-
/* ENCODING Values */
#define SFF8024_ENCODING_UNSPEC 0x00
#define SFF8024_ENCODING_8B10B 0x01
@@ -196,18 +129,8 @@ struct sff_diags {
};
double convert_mw_to_dbm(double mw);
-void sff_show_value_with_unit(const __u8 *id, unsigned int reg,
- const char *name, unsigned int mult,
- const char *unit);
-void sff_show_ascii(const __u8 *id, unsigned int first_reg,
- unsigned int last_reg, const char *name);
-void sff_show_lane_status(const char *name, unsigned int lane_cnt,
- const char *yes, const char *no, unsigned int value);
void sff_show_thresholds(struct sff_diags sd);
-void sff8024_show_oui(const __u8 *id, int id_offset);
-void sff8024_show_identifier(const __u8 *id, int id_offset);
-void sff8024_show_connector(const __u8 *id, int ctor_offset);
void sff8024_show_encoding(const __u8 *id, int encoding_offset, int sff_type);
void sff_show_revision_compliance(const __u8 *id, int rev_offset);
diff --git a/sfpdiag.c b/sfpdiag.c
index 1fa8b7b..bbca91e 100644
--- a/sfpdiag.c
+++ b/sfpdiag.c
@@ -12,7 +12,7 @@
#include <math.h>
#include <arpa/inet.h>
#include "internal.h"
-#include "sff-common.h"
+#include "module-common.h"
/* Offsets in decimal, for direct comparison with the SFF specs */
@@ -263,8 +263,7 @@ void sff8472_show_all(const __u8 *id)
PRINT_xX_PWR(rx_power_string, sd.rx_power[MCURR]);
- PRINT_TEMP("Module temperature", sd.sfp_temp[MCURR]);
- PRINT_VCC("Module voltage", sd.sfp_voltage[MCURR]);
+ module_show_dom_mod_lvl_monitors(&sd);
printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
(sd.supports_alarms ? "Yes" : "No"));
diff --git a/sfpid.c b/sfpid.c
index 1bc45c1..3c126b4 100644
--- a/sfpid.c
+++ b/sfpid.c
@@ -10,7 +10,7 @@
#include <stdio.h>
#include <errno.h>
#include "internal.h"
-#include "sff-common.h"
+#include "module-common.h"
#include "netlink/extapi.h"
#define SFF8079_PAGE_SIZE 0x80
@@ -19,7 +19,7 @@
static void sff8079_show_identifier(const __u8 *id)
{
- sff8024_show_identifier(id, 0);
+ module_show_identifier(id, 0);
}
static void sff8079_show_ext_identifier(const __u8 *id)
@@ -37,7 +37,7 @@ static void sff8079_show_ext_identifier(const __u8 *id)
static void sff8079_show_connector(const __u8 *id)
{
- sff8024_show_connector(id, 2);
+ module_show_connector(id, 2);
}
static void sff8079_show_transceiver(const __u8 *id)
@@ -299,12 +299,6 @@ static void sff8079_show_rate_identifier(const __u8 *id)
}
}
-static void sff8079_show_oui(const __u8 *id)
-{
- printf("\t%-41s : %02x:%02x:%02x\n", "Vendor OUI",
- id[37], id[38], id[39]);
-}
-
static void sff8079_show_wavelength_or_copper_compliance(const __u8 *id)
{
if (id[8] & (1 << 2)) {
@@ -344,30 +338,6 @@ static void sff8079_show_wavelength_or_copper_compliance(const __u8 *id)
}
}
-static void sff8079_show_value_with_unit(const __u8 *id, unsigned int reg,
- const char *name, unsigned int mult,
- const char *unit)
-{
- unsigned int val = id[reg];
-
- printf("\t%-41s : %u%s\n", name, val * mult, unit);
-}
-
-static void sff8079_show_ascii(const __u8 *id, unsigned int first_reg,
- unsigned int last_reg, const char *name)
-{
- unsigned int reg, val;
-
- printf("\t%-41s : ", name);
- while (first_reg <= last_reg && id[last_reg] == ' ')
- last_reg--;
- for (reg = first_reg; reg <= last_reg; reg++) {
- val = id[reg];
- putchar(((val >= 32) && (val <= 126)) ? val : '_');
- }
- printf("\n");
-}
-
static void sff8079_show_options(const __u8 *id)
{
static const char *pfx =
@@ -425,24 +395,24 @@ 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);
- sff8079_show_value_with_unit(id, 14,
- "Length (SMF,km)", 1, "km");
- sff8079_show_value_with_unit(id, 15, "Length (SMF)", 100, "m");
- sff8079_show_value_with_unit(id, 16, "Length (50um)", 10, "m");
- sff8079_show_value_with_unit(id, 17,
+ 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");
- sff8079_show_value_with_unit(id, 18, "Length (Copper)", 1, "m");
- sff8079_show_value_with_unit(id, 19, "Length (OM3)", 10, "m");
+ module_show_value_with_unit(id, 18, "Length (Copper)", 1, "m");
+ module_show_value_with_unit(id, 19, "Length (OM3)", 10, "m");
sff8079_show_wavelength_or_copper_compliance(id);
- sff8079_show_ascii(id, 20, 35, "Vendor name");
- sff8079_show_oui(id);
- sff8079_show_ascii(id, 40, 55, "Vendor PN");
- sff8079_show_ascii(id, 56, 59, "Vendor rev");
+ module_show_ascii(id, 20, 35, "Vendor name");
+ module_show_oui(id, 37);
+ module_show_ascii(id, 40, 55, "Vendor PN");
+ module_show_ascii(id, 56, 59, "Vendor rev");
sff8079_show_options(id);
printf("\t%-41s : %u%s\n", "BR margin, max", br_max, "%");
printf("\t%-41s : %u%s\n", "BR margin, min", br_min, "%");
- sff8079_show_ascii(id, 68, 83, "Vendor SN");
- sff8079_show_ascii(id, 84, 91, "Date code");
+ module_show_ascii(id, 68, 83, "Vendor SN");
+ module_show_ascii(id, 84, 91, "Date code");
}
}
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 02/14] sff_common: Move sff_show_revision_compliance() to qsfp.c
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 01/14] module_common: Add a new file to all the common code for all module types Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 03/14] cmis: Change loop order in cmis_show_dom_chan_lvl_flags() Danielle Ratson
` (11 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
The only use of the function sff_show_revision_compliance() is in qsfp.c
file.
Therefore, it doesn't belong to sff_common.c file but it can simply be a
static function in qsfp.c.
Move sff_show_revision_compliance() function to qsfp.c.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
qsfp.c | 40 ++++++++++++++++++++++++++++++++++++++--
sff-common.c | 36 ------------------------------------
sff-common.h | 1 -
3 files changed, 38 insertions(+), 39 deletions(-)
diff --git a/qsfp.c b/qsfp.c
index 6d774f8..6c7e72c 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -514,6 +514,42 @@ sff8636_show_wavelength_or_copper_compliance(const struct sff8636_memory_map *ma
}
}
+static void sff8636_show_revision_compliance(const __u8 *id, int rev_offset)
+{
+ static const char *pfx =
+ "\tRevision Compliance :";
+
+ switch (id[rev_offset]) {
+ case SFF8636_REV_UNSPECIFIED:
+ printf("%s Revision not specified\n", pfx);
+ break;
+ case SFF8636_REV_8436_48:
+ printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
+ break;
+ case SFF8636_REV_8436_8636:
+ printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
+ break;
+ case SFF8636_REV_8636_13:
+ printf("%s SFF-8636 Rev 1.3 or earlier\n", pfx);
+ break;
+ case SFF8636_REV_8636_14:
+ printf("%s SFF-8636 Rev 1.4\n", pfx);
+ break;
+ case SFF8636_REV_8636_15:
+ printf("%s SFF-8636 Rev 1.5\n", pfx);
+ break;
+ case SFF8636_REV_8636_20:
+ printf("%s SFF-8636 Rev 2.0\n", pfx);
+ break;
+ case SFF8636_REV_8636_27:
+ printf("%s SFF-8636 Rev 2.5/2.6/2.7\n", pfx);
+ break;
+ default:
+ printf("%s Unallocated\n", pfx);
+ break;
+ }
+}
+
/*
* 2-byte internal temperature conversions:
* First byte is a signed 8-bit integer, which is the temp decimal part
@@ -757,8 +793,8 @@ static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
SFF8636_VENDOR_SN_END_OFFSET, "Vendor SN");
module_show_ascii(map->page_00h, SFF8636_DATE_YEAR_OFFSET,
SFF8636_DATE_VENDOR_LOT_OFFSET + 1, "Date code");
- sff_show_revision_compliance(map->lower_memory,
- SFF8636_REV_COMPLIANCE_OFFSET);
+ sff8636_show_revision_compliance(map->lower_memory,
+ SFF8636_REV_COMPLIANCE_OFFSET);
sff8636_show_signals(map);
}
diff --git a/sff-common.c b/sff-common.c
index 6712b3e..e2f2463 100644
--- a/sff-common.c
+++ b/sff-common.c
@@ -122,39 +122,3 @@ void sff_show_thresholds(struct sff_diags sd)
PRINT_xX_PWR("Laser rx power low warning threshold",
sd.rx_power[LWARN]);
}
-
-void sff_show_revision_compliance(const __u8 *id, int rev_offset)
-{
- static const char *pfx =
- "\tRevision Compliance :";
-
- switch (id[rev_offset]) {
- case SFF8636_REV_UNSPECIFIED:
- printf("%s Revision not specified\n", pfx);
- break;
- case SFF8636_REV_8436_48:
- printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
- break;
- case SFF8636_REV_8436_8636:
- printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
- break;
- case SFF8636_REV_8636_13:
- printf("%s SFF-8636 Rev 1.3 or earlier\n", pfx);
- break;
- case SFF8636_REV_8636_14:
- printf("%s SFF-8636 Rev 1.4\n", pfx);
- break;
- case SFF8636_REV_8636_15:
- printf("%s SFF-8636 Rev 1.5\n", pfx);
- break;
- case SFF8636_REV_8636_20:
- printf("%s SFF-8636 Rev 2.0\n", pfx);
- break;
- case SFF8636_REV_8636_27:
- printf("%s SFF-8636 Rev 2.5/2.6/2.7\n", pfx);
- break;
- default:
- printf("%s Unallocated\n", pfx);
- break;
- }
-}
diff --git a/sff-common.h b/sff-common.h
index 34f1275..161860c 100644
--- a/sff-common.h
+++ b/sff-common.h
@@ -132,6 +132,5 @@ double convert_mw_to_dbm(double mw);
void sff_show_thresholds(struct sff_diags sd);
void sff8024_show_encoding(const __u8 *id, int encoding_offset, int sff_type);
-void sff_show_revision_compliance(const __u8 *id, int rev_offset);
#endif /* SFF_COMMON_H__ */
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 03/14] cmis: Change loop order in cmis_show_dom_chan_lvl_flags()
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 01/14] module_common: Add a new file to all the common code for all module types Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 02/14] sff_common: Move sff_show_revision_compliance() to qsfp.c Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 04/14] qsfp: Reorder the channel-level flags list for SFF8636 module type Danielle Ratson
` (10 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Currently, when printing channel-level flags in ethtool dump, we are
going over the banks, and for each bank, we are printing all the flags.
When JSON support will be added, in per-channel fields we would like to
have an array that each of its elements represents a channel.
Therefore, change the loop order so first we loop over the flags, and
for each one, we print all its channels.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Amit Cohen <amcohen@nvidia.com>
---
cmis.c | 25 ++++++++++++-------------
1 file changed, 12 insertions(+), 13 deletions(-)
diff --git a/cmis.c b/cmis.c
index 71f0745..9d89a5e 100644
--- a/cmis.c
+++ b/cmis.c
@@ -683,22 +683,19 @@ static void cmis_show_dom_mod_lvl_flags(const struct cmis_memory_map *map)
* [1] CMIS Rev. 5, page 162, section 8.9.3, Table 8-77
* [1] CMIS Rev. 5, page 164, section 8.9.3, Table 8-78
*/
-static void cmis_show_dom_chan_lvl_flags_chan(const struct cmis_memory_map *map,
- int bank, int chan)
+static void cmis_show_dom_chan_lvl_flag(const struct cmis_memory_map *map,
+ int bank, int flag)
{
const __u8 *page_11h = map->upper_memory[bank][0x11];
int i;
- for (i = 0; module_aw_chan_flags[i].fmt_str; i++) {
+ for (i = 0; i < CMIS_CHANNELS_PER_BANK; i++) {
+ int chan = bank * CMIS_CHANNELS_PER_BANK + i;
char str[80];
- if (!(map->page_01h[module_aw_chan_flags[i].adver_offset] &
- module_aw_chan_flags[i].adver_value))
- continue;
-
- snprintf(str, 80, module_aw_chan_flags[i].fmt_str, chan + 1);
+ snprintf(str, 80, module_aw_chan_flags[flag].fmt_str, chan + 1);
printf("\t%-41s : %s\n", str,
- page_11h[module_aw_chan_flags[i].offset] & chan ?
+ page_11h[module_aw_chan_flags[flag].offset] & chan ?
"On" : "Off");
}
}
@@ -708,15 +705,17 @@ cmis_show_dom_chan_lvl_flags_bank(const struct cmis_memory_map *map,
int bank)
{
const __u8 *page_11h = map->upper_memory[bank][0x11];
- int i;
+ int flag;
if (!page_11h)
return;
- for (i = 0; i < CMIS_CHANNELS_PER_BANK; i++) {
- int chan = bank * CMIS_CHANNELS_PER_BANK + i;
+ for (flag = 0; module_aw_chan_flags[flag].fmt_str; flag++) {
+ if (!(map->page_01h[module_aw_chan_flags[flag].adver_offset] &
+ module_aw_chan_flags[flag].adver_value))
+ continue;
- cmis_show_dom_chan_lvl_flags_chan(map, bank, chan);
+ cmis_show_dom_chan_lvl_flag(map, bank, flag);
}
}
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 04/14] qsfp: Reorder the channel-level flags list for SFF8636 module type
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (2 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 03/14] cmis: Change loop order in cmis_show_dom_chan_lvl_flags() Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions Danielle Ratson
` (9 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
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>
---
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
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (3 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 04/14] qsfp: Reorder the channel-level flags list for SFF8636 module type Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-27 19:44 ` Vadim Fedorenko
2025-01-26 11:56 ` [PATCH ethtool-next 06/14] module_common: Add helpers to support JSON printing for common value types Danielle Ratson
` (8 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
The sff8636_show_dom() function is quite lengthy, and with the planned
addition of JSON support, it will become even longer and more complex.
To improve readability and maintainability, refactor the function by
moving portions of the code into separate functions, following the
approach used in the cmis.c module.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
qsfp.c | 144 +++++++++++++++++++++++++++++++++++----------------------
1 file changed, 89 insertions(+), 55 deletions(-)
diff --git a/qsfp.c b/qsfp.c
index 674242c..13d8fb7 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -649,13 +649,94 @@ out:
}
}
-static void sff8636_show_dom(const struct sff8636_memory_map *map)
+static void sff8636_show_dom_chan_lvl_tx_bias(const struct sff_diags *sd)
+{
+ char power_string[MAX_DESC_SIZE];
+ int i;
+
+ for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ "Laser tx bias current", i+1);
+ PRINT_BIAS(power_string, sd->scd[i].bias_cur);
+ }
+}
+
+static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags *sd)
+{
+ char power_string[MAX_DESC_SIZE];
+ int i;
+
+ for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ "Transmit avg optical power", i+1);
+ PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
+ }
+}
+
+static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags *sd)
{
- struct sff_diags sd = {0};
- char *rx_power_string = NULL;
char power_string[MAX_DESC_SIZE];
+ char *rx_power_string = NULL;
+ int i;
+
+ if (!sd->rx_power_type)
+ rx_power_string = "Receiver signal OMA";
+ else
+ rx_power_string = "Rcvr signal avg optical power";
+
+ for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ rx_power_string, i+1);
+ PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
+ }
+}
+
+static void
+sff8636_show_dom_chan_lvl_flags(const struct sff8636_memory_map *map)
+{
+ bool value;
int i;
+ for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
+ 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,
+ ONOFF(value));
+ 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--;
+ }
+}
+
+static void
+sff8636_show_dom_mod_lvl_flags(const struct sff8636_memory_map *map)
+{
+ int i;
+
+ for (i = 0; module_aw_mod_flags[i].str; ++i) {
+ if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
+ printf("\t%-41s : %s\n",
+ module_aw_mod_flags[i].str,
+ ONOFF(map->lower_memory[module_aw_mod_flags[i].offset]
+ & module_aw_mod_flags[i].value));
+ }
+}
+
+static void sff8636_show_dom(const struct sff8636_memory_map *map)
+{
+ struct sff_diags sd = {0};
+
/*
* There is no clear identifier to signify the existence of
* optical diagnostics similar to SFF-8472. So checking existence
@@ -687,60 +768,13 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
(sd.supports_alarms ? "Yes" : "No"));
- for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- "Laser tx bias current", i+1);
- PRINT_BIAS(power_string, sd.scd[i].bias_cur);
- }
-
- for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- "Transmit avg optical power", i+1);
- PRINT_xX_PWR(power_string, sd.scd[i].tx_power);
- }
-
- if (!sd.rx_power_type)
- rx_power_string = "Receiver signal OMA";
- else
- rx_power_string = "Rcvr signal avg optical power";
-
- for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s(Channel %d)",
- rx_power_string, i+1);
- PRINT_xX_PWR(power_string, sd.scd[i].rx_power);
- }
+ sff8636_show_dom_chan_lvl_tx_bias(&sd);
+ sff8636_show_dom_chan_lvl_tx_power(&sd);
+ sff8636_show_dom_chan_lvl_rx_power(&sd);
if (sd.supports_alarms) {
- bool value;
-
- for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
- 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)
- printf("\t%-41s : %s\n",
- module_aw_mod_flags[i].str,
- (map->lower_memory[module_aw_mod_flags[i].offset]
- & module_aw_mod_flags[i].value) ?
- "On" : "Off");
- }
+ sff8636_show_dom_chan_lvl_flags(map);
+ sff8636_show_dom_mod_lvl_flags(map);
sff_show_thresholds(sd);
}
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions
2025-01-26 11:56 ` [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions Danielle Ratson
@ 2025-01-27 19:44 ` Vadim Fedorenko
2025-01-28 13:17 ` Danielle Ratson
0 siblings, 1 reply; 39+ messages in thread
From: Vadim Fedorenko @ 2025-01-27 19:44 UTC (permalink / raw)
To: Danielle Ratson, netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw
On 26/01/2025 03:56, Danielle Ratson wrote:
> The sff8636_show_dom() function is quite lengthy, and with the planned
> addition of JSON support, it will become even longer and more complex.
>
> To improve readability and maintainability, refactor the function by
> moving portions of the code into separate functions, following the
> approach used in the cmis.c module.
>
> Signed-off-by: Danielle Ratson <danieller@nvidia.com>
> ---
> qsfp.c | 144 +++++++++++++++++++++++++++++++++++----------------------
> 1 file changed, 89 insertions(+), 55 deletions(-)
>
> diff --git a/qsfp.c b/qsfp.c
> index 674242c..13d8fb7 100644
> --- a/qsfp.c
> +++ b/qsfp.c
> @@ -649,13 +649,94 @@ out:
> }
> }
>
> -static void sff8636_show_dom(const struct sff8636_memory_map *map)
> +static void sff8636_show_dom_chan_lvl_tx_bias(const struct sff_diags *sd)
> +{
> + char power_string[MAX_DESC_SIZE];
> + int i;
> +
> + for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> + snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> + "Laser tx bias current", i+1);
> + PRINT_BIAS(power_string, sd->scd[i].bias_cur);
> + }
> +}
> +
> +static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags *sd)
> +{
> + char power_string[MAX_DESC_SIZE];
> + int i;
> +
> + for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> + snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> + "Transmit avg optical power", i+1);
> + PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
> + }
> +}
> +
> +static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags *sd)
> {
> - struct sff_diags sd = {0};
> - char *rx_power_string = NULL;
> char power_string[MAX_DESC_SIZE];
> + char *rx_power_string = NULL;
> + int i;
> +
> + if (!sd->rx_power_type)
> + rx_power_string = "Receiver signal OMA";
> + else
> + rx_power_string = "Rcvr signal avg optical power";
> +
> + for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> + snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> + rx_power_string, i+1);
> + PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
> + }
> +}
> +
> +static void
> +sff8636_show_dom_chan_lvl_flags(const struct sff8636_memory_map *map)
> +{
> + bool value;
> int i;
>
> + for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
> + 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,
> + ONOFF(value));
> + 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);
Why do we need this complex logic of comparing strings and moving
iterators forth and back? We do have SFF8636_MAX_CHANNEL_NUM in other
functions, and we know that module_aw_chan_flags has items for all
channels, we can simplify the loop here by providing channel number
as ((i % SFF8636_MAX_CHANNEL_NUM) + 1). That will make the code much
easier to read.
This comment actually applies to the previous patch, as current one
simply moves it to a dedicated function. But I think patch 4 and
patch 5 can be merged in one.
> + i--;
> + }
> +}
> +
> +static void
> +sff8636_show_dom_mod_lvl_flags(const struct sff8636_memory_map *map)
> +{
> + int i;
> +
> + for (i = 0; module_aw_mod_flags[i].str; ++i) {
> + if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
> + printf("\t%-41s : %s\n",
> + module_aw_mod_flags[i].str,
> + ONOFF(map->lower_memory[module_aw_mod_flags[i].offset]
> + & module_aw_mod_flags[i].value));
> + }
> +}
> +
> +static void sff8636_show_dom(const struct sff8636_memory_map *map)
> +{
> + struct sff_diags sd = {0};
> +
> /*
> * There is no clear identifier to signify the existence of
> * optical diagnostics similar to SFF-8472. So checking existence
> @@ -687,60 +768,13 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
> printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
> (sd.supports_alarms ? "Yes" : "No"));
>
> - for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> - snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> - "Laser tx bias current", i+1);
> - PRINT_BIAS(power_string, sd.scd[i].bias_cur);
> - }
> -
> - for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> - snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> - "Transmit avg optical power", i+1);
> - PRINT_xX_PWR(power_string, sd.scd[i].tx_power);
> - }
> -
> - if (!sd.rx_power_type)
> - rx_power_string = "Receiver signal OMA";
> - else
> - rx_power_string = "Rcvr signal avg optical power";
> -
> - for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> - snprintf(power_string, MAX_DESC_SIZE, "%s(Channel %d)",
> - rx_power_string, i+1);
> - PRINT_xX_PWR(power_string, sd.scd[i].rx_power);
> - }
> + sff8636_show_dom_chan_lvl_tx_bias(&sd);
> + sff8636_show_dom_chan_lvl_tx_power(&sd);
> + sff8636_show_dom_chan_lvl_rx_power(&sd);
>
> if (sd.supports_alarms) {
> - bool value;
> -
> - for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
> - 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)
> - printf("\t%-41s : %s\n",
> - module_aw_mod_flags[i].str,
> - (map->lower_memory[module_aw_mod_flags[i].offset]
> - & module_aw_mod_flags[i].value) ?
> - "On" : "Off");
> - }
> + sff8636_show_dom_chan_lvl_flags(map);
> + sff8636_show_dom_mod_lvl_flags(map);
>
> sff_show_thresholds(sd);
> }
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions
2025-01-27 19:44 ` Vadim Fedorenko
@ 2025-01-28 13:17 ` Danielle Ratson
0 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-28 13:17 UTC (permalink / raw)
To: Vadim Fedorenko, netdev@vger.kernel.org
Cc: mkubecek@suse.cz, matt@traverse.com.au, daniel.zahka@gmail.com,
Amit Cohen, NBU-mlxsw
> From: Vadim Fedorenko <vadim.fedorenko@linux.dev>
> Sent: Monday, 27 January 2025 21:44
> To: Danielle Ratson <danieller@nvidia.com>; netdev@vger.kernel.org
> Cc: mkubecek@suse.cz; matt@traverse.com.au; daniel.zahka@gmail.com;
> Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw <nbu-
> mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom()
> by moving code into separate functions
>
> On 26/01/2025 03:56, Danielle Ratson wrote:
> > The sff8636_show_dom() function is quite lengthy, and with the planned
> > addition of JSON support, it will become even longer and more complex.
> >
> > To improve readability and maintainability, refactor the function by
> > moving portions of the code into separate functions, following the
> > approach used in the cmis.c module.
> >
> > Signed-off-by: Danielle Ratson <danieller@nvidia.com>
> > ---
> > qsfp.c | 144 +++++++++++++++++++++++++++++++++++-------------------
> ---
> > 1 file changed, 89 insertions(+), 55 deletions(-)
> >
> > diff --git a/qsfp.c b/qsfp.c
> > index 674242c..13d8fb7 100644
> > --- a/qsfp.c
> > +++ b/qsfp.c
> > @@ -649,13 +649,94 @@ out:
> > }
> > }
> >
> > -static void sff8636_show_dom(const struct sff8636_memory_map *map)
> > +static void sff8636_show_dom_chan_lvl_tx_bias(const struct sff_diags
> > +*sd) {
> > + char power_string[MAX_DESC_SIZE];
> > + int i;
> > +
> > + for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> > + snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> > + "Laser tx bias current", i+1);
> > + PRINT_BIAS(power_string, sd->scd[i].bias_cur);
> > + }
> > +}
> > +
> > +static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags
> > +*sd) {
> > + char power_string[MAX_DESC_SIZE];
> > + int i;
> > +
> > + for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> > + snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> > + "Transmit avg optical power", i+1);
> > + PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
> > + }
> > +}
> > +
> > +static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags
> > +*sd)
> > {
> > - struct sff_diags sd = {0};
> > - char *rx_power_string = NULL;
> > char power_string[MAX_DESC_SIZE];
> > + char *rx_power_string = NULL;
> > + int i;
> > +
> > + if (!sd->rx_power_type)
> > + rx_power_string = "Receiver signal OMA";
> > + else
> > + rx_power_string = "Rcvr signal avg optical power";
> > +
> > + for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> > + snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> > + rx_power_string, i+1);
> > + PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
> > + }
> > +}
> > +
> > +static void
> > +sff8636_show_dom_chan_lvl_flags(const struct sff8636_memory_map
> *map)
> > +{
> > + bool value;
> > int i;
> >
> > + for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
> > + 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,
> > + ONOFF(value));
> > + 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);
>
> Why do we need this complex logic of comparing strings and moving iterators
> forth and back? We do have SFF8636_MAX_CHANNEL_NUM in other
> functions, and we know that module_aw_chan_flags has items for all
> channels, we can simplify the loop here by providing channel number as ((i %
> SFF8636_MAX_CHANNEL_NUM) + 1). That will make the code much easier to
> read.
>
> This comment actually applies to the previous patch, as current one simply
> moves it to a dedicated function. But I think patch 4 and patch 5 can be
> merged in one.
Of course you are right ill change that, thanks!
Regarding the patches merge, I think it should be separated since this code is not easy to follow anyway so I think it is better to split as much as possible.
>
>
> > + i--;
> > + }
> > +}
> > +
> > +static void
> > +sff8636_show_dom_mod_lvl_flags(const struct sff8636_memory_map
> *map)
> > +{
> > + int i;
> > +
> > + for (i = 0; module_aw_mod_flags[i].str; ++i) {
> > + if (module_aw_mod_flags[i].type ==
> MODULE_TYPE_SFF8636)
> > + printf("\t%-41s : %s\n",
> > + module_aw_mod_flags[i].str,
> > + ONOFF(map-
> >lower_memory[module_aw_mod_flags[i].offset]
> > + & module_aw_mod_flags[i].value));
> > + }
> > +}
> > +
> > +static void sff8636_show_dom(const struct sff8636_memory_map *map)
> {
> > + struct sff_diags sd = {0};
> > +
> > /*
> > * There is no clear identifier to signify the existence of
> > * optical diagnostics similar to SFF-8472. So checking existence
> > @@ -687,60 +768,13 @@ static void sff8636_show_dom(const struct
> sff8636_memory_map *map)
> > printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
> > (sd.supports_alarms ? "Yes" : "No"));
> >
> > - for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> > - snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> > - "Laser tx bias current", i+1);
> > - PRINT_BIAS(power_string, sd.scd[i].bias_cur);
> > - }
> > -
> > - for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> > - snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
> > - "Transmit avg optical power", i+1);
> > - PRINT_xX_PWR(power_string, sd.scd[i].tx_power);
> > - }
> > -
> > - if (!sd.rx_power_type)
> > - rx_power_string = "Receiver signal OMA";
> > - else
> > - rx_power_string = "Rcvr signal avg optical power";
> > -
> > - for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
> > - snprintf(power_string, MAX_DESC_SIZE, "%s(Channel %d)",
> > - rx_power_string, i+1);
> > - PRINT_xX_PWR(power_string, sd.scd[i].rx_power);
> > - }
> > + sff8636_show_dom_chan_lvl_tx_bias(&sd);
> > + sff8636_show_dom_chan_lvl_tx_power(&sd);
> > + sff8636_show_dom_chan_lvl_rx_power(&sd);
> >
> > if (sd.supports_alarms) {
> > - bool value;
> > -
> > - for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
> > - 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)
> > - printf("\t%-41s : %s\n",
> > - module_aw_mod_flags[i].str,
> > - (map-
> >lower_memory[module_aw_mod_flags[i].offset]
> > - & module_aw_mod_flags[i].value) ?
> > - "On" : "Off");
> > - }
> > + sff8636_show_dom_chan_lvl_flags(map);
> > + sff8636_show_dom_mod_lvl_flags(map);
> >
> > sff_show_thresholds(sd);
> > }
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH ethtool-next 06/14] module_common: Add helpers to support JSON printing for common value types
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (4 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 05/14] qsfp: Refactor sff8636_show_dom() by moving code into separate functions Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 07/14] cmis: Add JSON output handling to --module-info in CMIS modules Danielle Ratson
` (7 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Upcoming patches will introduce JSON support to the ethtool dump. The
ethtool dump currently handles various field types, including strings,
unsigned integers, floats, etc.
To facilitate this transition, implement helper functions for commonly
used types. These helpers will enable consistent printing for both JSON
and regular dump formats.
In addition, add JSON support for common functions and defines to use in
the upcoming patches.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
module-common.c | 367 ++++++++++++++++++++++++++++++++++++------------
module-common.h | 7 +
sff-common.c | 98 +++++++++++--
sff-common.h | 41 ++++++
4 files changed, 407 insertions(+), 106 deletions(-)
diff --git a/module-common.c b/module-common.c
index 4146a84..e6fbbb2 100644
--- a/module-common.c
+++ b/module-common.c
@@ -5,6 +5,7 @@
#include <stdio.h>
#include <math.h>
+#include <ctype.h>
#include "module-common.h"
const struct module_aw_mod module_aw_mod_flags[] = {
@@ -198,309 +199,491 @@ const struct module_aw_chan module_aw_chan_flags[] = {
{ 0, NULL, 0, 0, 0 },
};
+void convert_json_field_name(const char *str, char *json_str)
+{
+ for (size_t i = 0; i < strlen(str); i++)
+ json_str[i] = (str[i] == ' ') ?
+ '_' : tolower((unsigned char)str[i]);
+}
+
+void module_print_any_units(const char *json_fn, const char *unit)
+{
+ char units_fn[64];
+
+ sprintf(units_fn, "%s_units", json_fn);
+
+ if (is_json_context()) {
+ if (unit)
+ print_string(PRINT_JSON, units_fn, "%s", unit);
+ } else {
+ if (unit)
+ printf("%s", unit);
+ }
+}
+
+void module_print_any_uint(const char *fn, int value, const char *unit)
+{
+ char json_fn[100] = "";
+
+ if (is_json_context()) {
+ convert_json_field_name(fn, json_fn);
+ print_uint(PRINT_JSON, json_fn, "%u", value);
+ } else {
+ printf("\t%-41s : %u", fn, value);
+ }
+
+ if (unit)
+ module_print_any_units(json_fn, unit);
+ print_nl();
+}
+
+void module_print_any_string(const char *fn, const char *value)
+{
+ char json_fn[100] = "";
+
+ if (is_json_context()) {
+ convert_json_field_name(fn, json_fn);
+ print_string(PRINT_JSON, json_fn, "%s", value);
+ } else {
+ printf("\t%-41s : %s\n", fn, value);
+ }
+}
+
+void module_print_any_float(const char *fn, float value, const char *unit)
+{
+ char json_fn[100] = "";
+
+ if (is_json_context()) {
+ convert_json_field_name(fn, json_fn);
+ print_float(PRINT_JSON, json_fn, "%.04f", value);
+ } else {
+ printf("\t%-41s : %.04f", fn, value);
+ }
+
+ if (unit)
+ module_print_any_units(json_fn, unit);
+ print_nl();
+}
+
+void module_print_any_bool(const char *fn, char *given_json_fn, bool value,
+ const char *str_value)
+{
+ char json_fn[100] = "";
+
+ if (!given_json_fn)
+ convert_json_field_name(fn, json_fn);
+ else
+ strcpy(json_fn, given_json_fn);
+
+ if (is_json_context())
+ print_bool(PRINT_JSON, json_fn, NULL, value);
+ else
+ printf("\t%-41s : %s\n", fn, str_value);
+}
+
void module_show_value_with_unit(const __u8 *id, unsigned int reg,
const char *name, unsigned int mult,
const char *unit)
{
unsigned int val = id[reg];
- printf("\t%-41s : %u%s\n", name, val * mult, unit);
+ module_print_any_uint(name, val * mult, unit);
}
void module_show_ascii(const __u8 *id, unsigned int first_reg,
unsigned int last_reg, const char *name)
{
+ char json_fn[100] = "";
+ char val_str[32] = "";
unsigned int reg, val;
- printf("\t%-41s : ", name);
+ if (is_json_context())
+ convert_json_field_name(name, json_fn);
+ else
+ printf("\t%-41s : ", name);
+
while (first_reg <= last_reg && id[last_reg] == ' ')
last_reg--;
for (reg = first_reg; reg <= last_reg; reg++) {
+ char val_char;
+
val = id[reg];
- putchar(((val >= 32) && (val <= 126)) ? val : '_');
+ val_char = (char)val;
+
+ if (is_json_context())
+ val_str[reg - first_reg] = (((val >= 32) && (val <= 126)) ?
+ val_char : '_');
+ else
+ putchar(((val >= 32) && (val <= 126)) ? val : '_');
}
- printf("\n");
+
+ if (is_json_context())
+ print_string(PRINT_JSON, json_fn, "%s", val_str);
+ else
+ printf("\n");
}
void module_show_lane_status(const char *name, unsigned int lane_cnt,
const char *yes, const char *no,
unsigned int value)
{
- printf("\t%-41s : ", name);
+ char json_fn[100] = "";
+
+ convert_json_field_name(name, json_fn);
+
if (!value) {
- printf("None\n");
+ if (is_json_context())
+ print_string(PRINT_JSON, json_fn, NULL, "None");
+ else
+ printf("\t%-41s : None\n", name);
return;
}
- printf("[");
- while (lane_cnt--) {
- printf(" %s%c", value & 1 ? yes : no, lane_cnt ? ',': ' ');
- value >>= 1;
+ if (is_json_context()) {
+ open_json_array(json_fn, "");
+
+ while (lane_cnt--) {
+ print_string(PRINT_JSON, NULL, "%s",
+ value & 1 ? yes : no);
+ value >>= 1;
+ }
+ close_json_array("");
+ } else {
+ printf("\t%-41s : [", name);
+ while (lane_cnt--) {
+ printf(" %s%c", value & 1 ? yes : no, lane_cnt ? ',': ' ');
+ value >>= 1;
+ }
+ printf("]\n");
}
- printf("]\n");
}
void module_show_oui(const __u8 *id, int id_offset)
{
- printf("\t%-41s : %02x:%02x:%02x\n", "Vendor OUI",
- id[id_offset], id[(id_offset) + 1],
- id[(id_offset) + 2]);
+ char oui_value[16];
+
+ if (is_json_context()) {
+ open_json_array("vendor_oui", "");
+ print_int(PRINT_JSON, NULL, NULL, id[id_offset]);
+ print_int(PRINT_JSON, NULL, NULL, id[(id_offset) + 1]);
+ print_int(PRINT_JSON, NULL, NULL, id[(id_offset) + 2]);
+ close_json_array("");
+ } else {
+ snprintf(oui_value, 16, "%02x:%02x:%02x", id[id_offset],
+ id[(id_offset) + 1], id[(id_offset) + 2]);
+ printf("\t%-41s : %s\n", "Vendor OUI", oui_value);
+ }
}
void module_show_identifier(const __u8 *id, int id_offset)
{
- printf("\t%-41s : 0x%02x", "Identifier", id[id_offset]);
+ char id_description[SFF_MAX_DESC_LEN];
+
switch (id[id_offset]) {
case MODULE_ID_UNKNOWN:
- printf(" (no module present, unknown, or unspecified)\n");
+ strncpy(id_description,
+ "no module present, unknown, or unspecified",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_GBIC:
- printf(" (GBIC)\n");
+ strncpy(id_description, "GBIC", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_SOLDERED_MODULE:
- printf(" (module soldered to motherboard)\n");
+ strncpy(id_description,
+ "module soldered to motherboard", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_SFP:
- printf(" (SFP)\n");
+ strncpy(id_description, "SFP", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_300_PIN_XBI:
- printf(" (300 pin XBI)\n");
+ strncpy(id_description, "300 pin XBI", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_XENPAK:
- printf(" (XENPAK)\n");
+ strncpy(id_description, "XENPAK", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_XFP:
- printf(" (XFP)\n");
+ strncpy(id_description, "XFP", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_XFF:
- printf(" (XFF)\n");
+ strncpy(id_description, "XFF", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_XFP_E:
- printf(" (XFP-E)\n");
+ strncpy(id_description, "XFP-E", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_XPAK:
- printf(" (XPAK)\n");
+ strncpy(id_description, "XPAK", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_X2:
- printf(" (X2)\n");
+ strncpy(id_description, "X2", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_DWDM_SFP:
- printf(" (DWDM-SFP)\n");
+ strncpy(id_description, "DWDM-SFP", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_QSFP:
- printf(" (QSFP)\n");
+ strncpy(id_description, "QSFP", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_QSFP_PLUS:
- printf(" (QSFP+)\n");
+ strncpy(id_description, "QSFP+", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_CXP:
- printf(" (CXP)\n");
+ strncpy(id_description, "CXP", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_HD4X:
- printf(" (Shielded Mini Multilane HD 4X)\n");
+ strncpy(id_description, "Shielded Mini Multilane HD 4X",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_HD8X:
- printf(" (Shielded Mini Multilane HD 8X)\n");
+ strncpy(id_description, "Shielded Mini Multilane HD 8X",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_QSFP28:
- printf(" (QSFP28)\n");
+ strncpy(id_description, "QSFP28", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_CXP2:
- printf(" (CXP2/CXP28)\n");
+ strncpy(id_description, "CXP2/CXP28", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_CDFP:
- printf(" (CDFP Style 1/Style 2)\n");
+ strncpy(id_description, "CDFP Style 1/Style 2",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_HD4X_FANOUT:
- printf(" (Shielded Mini Multilane HD 4X Fanout Cable)\n");
+ strncpy(id_description,
+ "Shielded Mini Multilane HD 4X Fanout Cable",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_HD8X_FANOUT:
- printf(" (Shielded Mini Multilane HD 8X Fanout Cable)\n");
+ strncpy(id_description,
+ "Shielded Mini Multilane HD 8X Fanout Cable",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_CDFP_S3:
- printf(" (CDFP Style 3)\n");
+ strncpy(id_description, "CDFP Style 3", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_MICRO_QSFP:
- printf(" (microQSFP)\n");
+ strncpy(id_description, "microQSFP", SFF_MAX_DESC_LEN);
break;
case MODULE_ID_QSFP_DD:
- printf(" (QSFP-DD Double Density 8X Pluggable Transceiver (INF-8628))\n");
+ strncpy(id_description,
+ "QSFP-DD Double Density 8X Pluggable Transceiver (INF-8628)",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_OSFP:
- printf(" (OSFP 8X Pluggable Transceiver)\n");
+ strncpy(id_description, "OSFP 8X Pluggable Transceiver",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_DSFP:
- printf(" (DSFP Dual Small Form Factor Pluggable Transceiver)\n");
+ strncpy(id_description,
+ "DSFP Dual Small Form Factor Pluggable Transceiver",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_QSFP_PLUS_CMIS:
- printf(" (QSFP+ or later with Common Management Interface Specification (CMIS))\n");
+ strncpy(id_description,
+ "QSFP+ or later with Common Management Interface Specification (CMIS)",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_SFP_DD_CMIS:
- printf(" (SFP-DD Double Density 2X Pluggable Transceiver with Common Management Interface Specification (CMIS))\n");
+ strncpy(id_description,
+ "SFP-DD Double Density 2X Pluggable Transceiver with Common Management Interface Specification (CMIS)",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_ID_SFP_PLUS_CMIS:
- printf(" (SFP+ and later with Common Management Interface Specification (CMIS))\n");
+ strncpy(id_description,
+ "SFP+ and later with Common Management Interface Specification (CMIS)",
+ SFF_MAX_DESC_LEN);
break;
default:
- printf(" (reserved or unknown)\n");
+ strncpy(id_description, "reserved or unknown",
+ SFF_MAX_DESC_LEN);
break;
}
+
+ sff_print_any_hex_field("Identifier", "identifier", id[id_offset],
+ id_description);
}
void module_show_connector(const __u8 *id, int ctor_offset)
{
- printf("\t%-41s : 0x%02x", "Connector", id[ctor_offset]);
+ char ctor_description[SFF_MAX_DESC_LEN];
+
switch (id[ctor_offset]) {
case MODULE_CTOR_UNKNOWN:
- printf(" (unknown or unspecified)\n");
+ strncpy(ctor_description, "unknown or unspecified",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_SC:
- printf(" (SC)\n");
+ strncpy(ctor_description, "SC", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_FC_STYLE_1:
- printf(" (Fibre Channel Style 1 copper)\n");
+ strncpy(ctor_description, "Fibre Channel Style 1 copper",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_FC_STYLE_2:
- printf(" (Fibre Channel Style 2 copper)\n");
+ strncpy(ctor_description, "Fibre Channel Style 2 copper",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_BNC_TNC:
- printf(" (BNC/TNC)\n");
+ strncpy(ctor_description, "BNC/TNC", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_FC_COAX:
- printf(" (Fibre Channel coaxial headers)\n");
+ strncpy(ctor_description, "Fibre Channel coaxial headers",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_FIBER_JACK:
- printf(" (FibreJack)\n");
+ strncpy(ctor_description, "FibreJack", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_LC:
- printf(" (LC)\n");
+ strncpy(ctor_description, "LC", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MT_RJ:
- printf(" (MT-RJ)\n");
+ strncpy(ctor_description, "MT-RJ", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MU:
- printf(" (MU)\n");
+ strncpy(ctor_description, "MU", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_SG:
- printf(" (SG)\n");
+ strncpy(ctor_description, "SG", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_OPT_PT:
- printf(" (Optical pigtail)\n");
+ strncpy(ctor_description, "Optical pigtail",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MPO:
- printf(" (MPO Parallel Optic)\n");
+ strncpy(ctor_description, "MPO Parallel Optic",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MPO_2:
- printf(" (MPO Parallel Optic - 2x16)\n");
+ strncpy(ctor_description, "MPO Parallel Optic - 2x16",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_HSDC_II:
- printf(" (HSSDC II)\n");
+ strncpy(ctor_description, "HSSDC II", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_COPPER_PT:
- printf(" (Copper pigtail)\n");
+ strncpy(ctor_description, "Copper pigtail",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_RJ45:
- printf(" (RJ45)\n");
+ strncpy(ctor_description, "RJ45", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_NO_SEPARABLE:
- printf(" (No separable connector)\n");
+ strncpy(ctor_description, "No separable connector",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MXC_2x16:
- printf(" (MXC 2x16)\n");
+ strncpy(ctor_description, "MXC 2x16", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_CS_OPTICAL:
- printf(" (CS optical connector)\n");
+ strncpy(ctor_description, "CS optical connector",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_CS_OPTICAL_MINI:
- printf(" (Mini CS optical connector)\n");
+ strncpy(ctor_description, "Mini CS optical connector",
+ SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MPO_2X12:
- printf(" (MPO 2x12)\n");
+ strncpy(ctor_description, "MPO 2x12", SFF_MAX_DESC_LEN);
break;
case MODULE_CTOR_MPO_1X16:
- printf(" (MPO 1x16)\n");
+ strncpy(ctor_description, "MPO 1x16", SFF_MAX_DESC_LEN);
break;
default:
- printf(" (reserved or unknown)\n");
+ strncpy(ctor_description, "reserved or unknown",
+ SFF_MAX_DESC_LEN);
break;
}
+
+ sff_print_any_hex_field("Connector", "connector", id[ctor_offset],
+ ctor_description);
}
void module_show_mit_compliance(u16 value)
{
- static const char *cc = " (Copper cable,";
-
- printf("\t%-41s : 0x%02x", "Transmitter technology", value);
+ static const char *cc = "Copper cable,";
+ char description[SFF_MAX_DESC_LEN];
switch (value) {
case MODULE_850_VCSEL:
- printf(" (850 nm VCSEL)\n");
+ strncpy(description, "850 nm VCSEL", SFF_MAX_DESC_LEN);
break;
case CMIS_1310_VCSEL:
case SFF8636_TRANS_1310_VCSEL:
- printf(" (1310 nm VCSEL)\n");
+ strncpy(description, "1310 nm VCSEL", SFF_MAX_DESC_LEN);
break;
case CMIS_1550_VCSEL:
case SFF8636_TRANS_1550_VCSEL:
- printf(" (1550 nm VCSEL)\n");
+ strncpy(description, "1550 nm VCSEL", SFF_MAX_DESC_LEN);
break;
case CMIS_1310_FP:
case SFF8636_TRANS_1310_FP:
- printf(" (1310 nm FP)\n");
+ strncpy(description, "1310 nm FP", SFF_MAX_DESC_LEN);
break;
case CMIS_1310_DFB:
case SFF8636_TRANS_1310_DFB:
- printf(" (1310 nm DFB)\n");
+ strncpy(description, "1310 nm DFB", SFF_MAX_DESC_LEN);
break;
case CMIS_1550_DFB:
case SFF8636_TRANS_1550_DFB:
- printf(" (1550 nm DFB)\n");
+ strncpy(description, "1550 nm DFB", SFF_MAX_DESC_LEN);
break;
case CMIS_1310_EML:
case SFF8636_TRANS_1310_EML:
- printf(" (1310 nm EML)\n");
+ strncpy(description, "1310 nm EML", SFF_MAX_DESC_LEN);
break;
case CMIS_1550_EML:
case SFF8636_TRANS_1550_EML:
- printf(" (1550 nm EML)\n");
+ strncpy(description, "1550 nm EML", SFF_MAX_DESC_LEN);
break;
case CMIS_OTHERS:
case SFF8636_TRANS_OTHERS:
- printf(" (Others/Undefined)\n");
+ strncpy(description, "Others/Undefined", SFF_MAX_DESC_LEN);
break;
case CMIS_1490_DFB:
case SFF8636_TRANS_1490_DFB:
- printf(" (1490 nm DFB)\n");
+ strncpy(description, "1490 nm DFB", SFF_MAX_DESC_LEN);
break;
case CMIS_COPPER_UNEQUAL:
case SFF8636_TRANS_COPPER_PAS_UNEQUAL:
- printf("%s unequalized)\n", cc);
+ snprintf(description, SFF_MAX_DESC_LEN, "%s unequalized", cc);
break;
case CMIS_COPPER_PASS_EQUAL:
case SFF8636_TRANS_COPPER_PAS_EQUAL:
- printf("%s passive equalized)\n", cc);
+ snprintf(description, SFF_MAX_DESC_LEN, "%s passive equalized",
+ cc);
break;
case CMIS_COPPER_NF_EQUAL:
case SFF8636_TRANS_COPPER_LNR_FAR_EQUAL:
- printf("%s near and far end limiting active equalizers)\n", cc);
+ snprintf(description, SFF_MAX_DESC_LEN,
+ "%s near and far end limiting active equalizers", cc);
break;
case CMIS_COPPER_F_EQUAL:
case SFF8636_TRANS_COPPER_FAR_EQUAL:
- printf("%s far end limiting active equalizers)\n", cc);
+ snprintf(description, SFF_MAX_DESC_LEN,
+ "%s far end limiting active equalizers", cc);
break;
case CMIS_COPPER_N_EQUAL:
case SFF8636_TRANS_COPPER_NEAR_EQUAL:
- printf("%s near end limiting active equalizers)\n", cc);
+ snprintf(description, SFF_MAX_DESC_LEN,
+ "%s near end limiting active equalizers", cc);
break;
case CMIS_COPPER_LINEAR_EQUAL:
case SFF8636_TRANS_COPPER_LNR_EQUAL:
- printf("%s linear active equalizers)\n", cc);
+ snprintf(description, SFF_MAX_DESC_LEN, "%s linear active equalizers",
+ cc);
break;
}
+
+ sff_print_any_hex_field("Transmitter technology",
+ "transmitter_technology", value, description);
}
void module_show_dom_mod_lvl_monitors(const struct sff_diags *sd)
{
- PRINT_TEMP("Module temperature", sd->sfp_temp[MCURR]);
- PRINT_VCC("Module voltage", sd->sfp_voltage[MCURR]);
+ PRINT_TEMP_ALL("Module temperature", "module_temperature",
+ sd->sfp_temp[MCURR]);
+ print_string(PRINT_JSON, "module_temperature_units", "%s", "degrees C");
+
+
+ PRINT_VCC_ALL("Module voltage", "module_voltage",
+ sd->sfp_voltage[MCURR]);
+ print_string(PRINT_JSON, "module_voltage_units", "%s", "V");
}
diff --git a/module-common.h b/module-common.h
index 8c34779..9c0adbb 100644
--- a/module-common.h
+++ b/module-common.h
@@ -264,6 +264,13 @@ struct module_aw_chan {
extern const struct module_aw_mod module_aw_mod_flags[];
extern const struct module_aw_chan module_aw_chan_flags[];
+void convert_json_field_name(const char *str, char *json_str);
+void module_print_any_units(const char *json_fn, const char *unit);
+void module_print_any_uint(const char *fn, int value, const char *unit);
+void module_print_any_string(const char *fn, const char *value);
+void module_print_any_float(const char *fn, float value, const char *unit);
+void module_print_any_bool(const char *fn, char *given_json_fn, bool value,
+ const char *str_value);
void module_show_value_with_unit(const __u8 *id, unsigned int reg,
const char *name, unsigned int mult,
const char *unit);
diff --git a/sff-common.c b/sff-common.c
index e2f2463..fb3945c 100644
--- a/sff-common.c
+++ b/sff-common.c
@@ -29,50 +29,120 @@ double convert_mw_to_dbm(double mw)
return (10. * log10(mw / 1000.)) + 30.;
}
+void sff_print_any_hex_field(const char *field_name,
+ const char *json_field_name, u8 value,
+ const char *desc)
+{
+ char desc_name[SFF_MAX_FIELD_LEN];
+
+ if (is_json_context()) {
+ print_int(PRINT_JSON, json_field_name, "0x%02x", value);
+ if (desc) {
+ snprintf(desc_name, SFF_MAX_FIELD_LEN,
+ "%s_description", json_field_name);
+ print_string(PRINT_JSON, desc_name, "%s", desc);
+ }
+ } else {
+ printf("\t%-41s : 0x%02x", field_name, value);
+ if (desc)
+ printf(" (%s)", desc);
+ print_nl();
+ }
+}
+
void sff8024_show_encoding(const __u8 *id, int encoding_offset, int sff_type)
{
- printf("\t%-41s : 0x%02x", "Encoding", id[encoding_offset]);
+ char encoding_desc[64];
+
switch (id[encoding_offset]) {
case SFF8024_ENCODING_UNSPEC:
- printf(" (unspecified)\n");
+ strncpy(encoding_desc, "unspecified", 64);
break;
case SFF8024_ENCODING_8B10B:
- printf(" (8B/10B)\n");
+ strncpy(encoding_desc, "8B/10B", 64);
break;
case SFF8024_ENCODING_4B5B:
- printf(" (4B/5B)\n");
+ strncpy(encoding_desc, "4B/5B", 64);
break;
case SFF8024_ENCODING_NRZ:
- printf(" (NRZ)\n");
+ strncpy(encoding_desc, "NRZ", 64);
break;
case SFF8024_ENCODING_4h:
if (sff_type == ETH_MODULE_SFF_8472)
- printf(" (Manchester)\n");
+ strncpy(encoding_desc, "Manchester", 64);
else if (sff_type == ETH_MODULE_SFF_8636)
- printf(" (SONET Scrambled)\n");
+ strncpy(encoding_desc, "SONET Scrambled", 64);
break;
case SFF8024_ENCODING_5h:
if (sff_type == ETH_MODULE_SFF_8472)
- printf(" (SONET Scrambled)\n");
+ strncpy(encoding_desc, "SONET Scrambled", 64);
else if (sff_type == ETH_MODULE_SFF_8636)
- printf(" (64B/66B)\n");
+ strncpy(encoding_desc, "64B/66B", 64);
break;
case SFF8024_ENCODING_6h:
if (sff_type == ETH_MODULE_SFF_8472)
- printf(" (64B/66B)\n");
+ strncpy(encoding_desc, "64B/66B", 64);
else if (sff_type == ETH_MODULE_SFF_8636)
- printf(" (Manchester)\n");
+ strncpy(encoding_desc, "Manchester", 64);
break;
case SFF8024_ENCODING_256B:
- printf(" ((256B/257B (transcoded FEC-enabled data))\n");
+ strncpy(encoding_desc,
+ "256B/257B (transcoded FEC-enabled data)", 64);
break;
case SFF8024_ENCODING_PAM4:
- printf(" (PAM4)\n");
+ strncpy(encoding_desc, "PAM4", 64);
break;
default:
- printf(" (reserved or unknown)\n");
+ strncpy(encoding_desc, "reserved or unknown", 64);
break;
}
+
+ sff_print_any_hex_field("Encoding", "encoding", id[encoding_offset],
+ encoding_desc);
+}
+
+
+void sff_show_thresholds_json(struct sff_diags sd)
+{
+ open_json_object("laser_bias_current");
+ PRINT_BIAS_JSON("high_alarm_threshold", sd.bias_cur[HALRM]);
+ PRINT_BIAS_JSON("low_alarm_threshold", sd.bias_cur[LALRM]);
+ PRINT_BIAS_JSON("high_warning_threshold", sd.bias_cur[HWARN]);
+ PRINT_BIAS_JSON("low_warning_threshold", sd.bias_cur[LWARN]);
+ print_string(PRINT_JSON, "units", "%s", "mA");
+ close_json_object();
+
+ open_json_object("laser_output_power");
+ PRINT_xX_PWR_JSON("high_alarm_threshold", sd.tx_power[HALRM]);
+ PRINT_xX_PWR_JSON("low_alarm_threshold", sd.tx_power[LALRM]);
+ PRINT_xX_PWR_JSON("high_warning_threshold", sd.tx_power[HWARN]);
+ PRINT_xX_PWR_JSON("low_warning_threshold", sd.tx_power[LWARN]);
+ print_string(PRINT_JSON, "units", "%s", "mW");
+ close_json_object();
+
+ open_json_object("module_temperature");
+ PRINT_TEMP_JSON("high_alarm_threshold", sd.sfp_temp[HALRM]);
+ PRINT_TEMP_JSON("low_alarm_threshold", sd.sfp_temp[LALRM]);
+ PRINT_TEMP_JSON("high_warning_threshold", sd.sfp_temp[HWARN]);
+ PRINT_TEMP_JSON("low_warning_threshold", sd.sfp_temp[LWARN]);
+ print_string(PRINT_JSON, "units", "%s", "degrees C");
+ close_json_object();
+
+ open_json_object("module_voltage");
+ PRINT_VCC_JSON("high_alarm_threshold", sd.sfp_voltage[HALRM]);
+ PRINT_VCC_JSON("low_alarm_threshold", sd.sfp_voltage[LALRM]);
+ PRINT_VCC_JSON("high_warning_threshold", sd.sfp_voltage[HWARN]);
+ PRINT_VCC_JSON("low_warning_threshold", sd.sfp_voltage[LWARN]);
+ print_string(PRINT_JSON, "units", "%s", "V");
+ close_json_object();
+
+ open_json_object("laser_rx_power");
+ PRINT_xX_PWR_JSON("high_alarm_threshold", sd.rx_power[HALRM]);
+ PRINT_xX_PWR_JSON("low_alarm_threshold", sd.rx_power[LALRM]);
+ PRINT_xX_PWR_JSON("high_warning_threshold", sd.rx_power[HWARN]);
+ PRINT_xX_PWR_JSON("low_warning_threshold", sd.rx_power[LWARN]);
+ print_string(PRINT_JSON, "units", "%s", "mW");
+ close_json_object();
}
void sff_show_thresholds(struct sff_diags sd)
diff --git a/sff-common.h b/sff-common.h
index 161860c..3c02a69 100644
--- a/sff-common.h
+++ b/sff-common.h
@@ -26,6 +26,9 @@
#include <stdio.h>
#include "internal.h"
+#define SFF_MAX_DESC_LEN 120
+#define SFF_MAX_FIELD_LEN 64
+
/* Revision compliance */
#define SFF8636_REV_UNSPECIFIED 0x00
#define SFF8636_REV_8436_48 0x01
@@ -71,19 +74,53 @@
(double)((var) / 10000.), \
convert_mw_to_dbm((double)((var) / 10000.)))
+#define PRINT_xX_PWR_JSON(string, var) \
+ print_float(PRINT_JSON, string, "%.2f", \
+ (double)((var) / 10000.))
+
+#define PRINT_xX_PWR_ALL(string, json_string, var) \
+ is_json_context() ? \
+ PRINT_xX_PWR_JSON(json_string, var) : \
+ PRINT_xX_PWR(string, var)
+
#define PRINT_BIAS(string, bias_cur) \
printf("\t%-41s : %.3f mA\n", (string), \
(double)(bias_cur / 500.))
+#define PRINT_BIAS_JSON(string, bias_cur) \
+ print_float(PRINT_JSON, string, "%.3f", \
+ (double)(bias_cur / 500.))
+
+#define PRINT_BIAS_ALL(string, json_string, bias_cur) \
+ is_json_context() ? \
+ PRINT_BIAS_JSON(json_string, bias_cur) : \
+ PRINT_BIAS(string, bias_cur)
+
#define PRINT_TEMP(string, temp) \
printf("\t%-41s : %.2f degrees C / %.2f degrees F\n", \
(string), (double)(temp / 256.), \
(double)(temp / 256. * 1.8 + 32.))
+#define PRINT_TEMP_JSON(string, temp) \
+ print_float(PRINT_JSON, string, "%.2f", (double)(temp / 256.))
+
+#define PRINT_TEMP_ALL(string, json_string, temp) \
+ is_json_context() ? \
+ PRINT_TEMP_JSON(json_string, temp) : PRINT_TEMP(string, temp)
+
#define PRINT_VCC(string, sfp_voltage) \
printf("\t%-41s : %.4f V\n", (string), \
(double)(sfp_voltage / 10000.))
+#define PRINT_VCC_JSON(string, sfp_voltage) \
+ print_float(PRINT_JSON, string, "%.4f", \
+ (double)(sfp_voltage / 10000.))
+
+#define PRINT_VCC_ALL(string, json_string, sfp_voltage) \
+ is_json_context() ? \
+ PRINT_VCC_JSON(json_string, sfp_voltage) : \
+ PRINT_VCC(string, sfp_voltage)
+
# define PRINT_xX_THRESH_PWR(string, var, index) \
PRINT_xX_PWR(string, (var)[(index)])
@@ -129,7 +166,11 @@ struct sff_diags {
};
double convert_mw_to_dbm(double mw);
+void sff_print_any_hex_field(const char *field_name,
+ const char *json_field_name, u8 value,
+ const char *desc);
void sff_show_thresholds(struct sff_diags sd);
+void sff_show_thresholds_json(struct sff_diags sd);
void sff8024_show_encoding(const __u8 *id, int encoding_offset, int sff_type);
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 07/14] cmis: Add JSON output handling to --module-info in CMIS modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (5 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 06/14] module_common: Add helpers to support JSON printing for common value types Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 08/14] cmis: Enable JSON output support " Danielle Ratson
` (6 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Add JSON output handling for 'ethtool -m' / --module-info, following the
guideline below:
1. Fields with description, will have a separate description field.
2. Fields with units, will have a separate unit field.
3. ASCII fields will be presented as strings.
4. On/Off is rendered as true/false.
5. Yes/no is rendered as true/false.
6. Per-channel fields will be presented as array, when each element
represents a channel.
7. Fields that hold version, will be split to major and minor sub fields.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
cmis.c | 285 +++++++++++++++++++++++++++++++++++++++------------------
1 file changed, 196 insertions(+), 89 deletions(-)
diff --git a/cmis.c b/cmis.c
index 9d89a5e..4901f57 100644
--- a/cmis.c
+++ b/cmis.c
@@ -62,7 +62,15 @@ static void cmis_show_rev_compliance(const struct cmis_memory_map *map)
int major = (rev >> 4) & 0x0F;
int minor = rev & 0x0F;
- printf("\t%-41s : Rev. %d.%d\n", "Revision compliance", major, minor);
+ if (is_json_context()) {
+ open_json_object("revision_compliance");
+ print_uint(PRINT_JSON, "major", "%u", major);
+ print_uint(PRINT_JSON, "minor", "%u", minor);
+ close_json_object();
+ } else {
+ printf("\t%-41s : Rev. %d.%d\n", "Revision compliance", major,
+ minor);
+ }
}
static void
@@ -123,8 +131,8 @@ static void cmis_show_power_info(const struct cmis_memory_map *map)
base_power = map->page_00h[CMIS_PWR_MAX_POWER_OFFSET];
max_power = base_power * 0.25f;
- printf("\t%-41s : %d\n", "Power class", power_class + 1);
- printf("\t%-41s : %.02fW\n", "Max power", max_power);
+ module_print_any_uint("Power class", power_class + 1, NULL);
+ module_print_any_float("Max power", max_power, "W");
}
/**
@@ -143,7 +151,7 @@ static void cmis_show_cbl_asm_len(const struct cmis_memory_map *map)
/* Check if max length */
if (map->page_00h[CMIS_CBL_ASM_LEN_OFFSET] == CMIS_6300M_MAX_LEN) {
- printf("\t%-41s : > 6.3km\n", fn);
+ module_print_any_string(fn, "> 6.3km");
return;
}
@@ -168,7 +176,7 @@ static void cmis_show_cbl_asm_len(const struct cmis_memory_map *map)
/* Get base value from first 6 bits and multiply by mul */
val = (map->page_00h[CMIS_CBL_ASM_LEN_OFFSET] & CMIS_LEN_VAL_MASK);
val = (float)val * mul;
- printf("\t%-41s : %0.2fm\n", fn, val);
+ module_print_any_float(fn, val, "m");
}
/**
@@ -202,7 +210,7 @@ static void cmis_print_smf_cbl_len(const struct cmis_memory_map *map)
/* Get base value from first 6 bits and multiply by mul */
val = (map->page_01h[CMIS_SMF_LEN_OFFSET] & CMIS_LEN_VAL_MASK);
val = (float)val * mul;
- printf("\t%-41s : %0.2fkm\n", fn, val);
+ module_print_any_float(fn, val, "km");
}
/**
@@ -212,22 +220,26 @@ static void cmis_print_smf_cbl_len(const struct cmis_memory_map *map)
*/
static void cmis_show_sig_integrity(const struct cmis_memory_map *map)
{
+ bool value;
+
if (!map->page_01h)
return;
/* CDR Bypass control: 2nd bit from each byte */
- printf("\t%-41s : ", "Tx CDR bypass control");
- printf("%s\n", YESNO(map->page_01h[CMIS_SIG_INTEG_TX_OFFSET] & 0x02));
+ value = map->page_01h[CMIS_SIG_INTEG_TX_OFFSET] & 0x02;
+ module_print_any_bool("Tx CDR bypass control", NULL, value,
+ YESNO(value));
- printf("\t%-41s : ", "Rx CDR bypass control");
- printf("%s\n", YESNO(map->page_01h[CMIS_SIG_INTEG_RX_OFFSET] & 0x02));
+ value = map->page_01h[CMIS_SIG_INTEG_RX_OFFSET] & 0x02;
+ module_print_any_bool("Rx CDR bypass control", NULL, value,
+ YESNO(value));
/* CDR Implementation: 1st bit from each byte */
- printf("\t%-41s : ", "Tx CDR");
- printf("%s\n", YESNO(map->page_01h[CMIS_SIG_INTEG_TX_OFFSET] & 0x01));
+ value = map->page_01h[CMIS_SIG_INTEG_TX_OFFSET] & 0x01;
+ module_print_any_bool("Tx CDR", NULL, value, YESNO(value));
- printf("\t%-41s : ", "Rx CDR");
- printf("%s\n", YESNO(map->page_01h[CMIS_SIG_INTEG_RX_OFFSET] & 0x01));
+ value = map->page_01h[CMIS_SIG_INTEG_RX_OFFSET] & 0x01;
+ module_print_any_bool("Rx CDR", NULL, value, YESNO(value));
}
/**
@@ -247,21 +259,25 @@ static void cmis_show_mit_compliance(const struct cmis_memory_map *map)
module_show_mit_compliance(value);
if (value >= CMIS_COPPER_UNEQUAL) {
- printf("\t%-41s : %udb\n", "Attenuation at 5GHz",
- map->page_00h[CMIS_COPPER_ATT_5GHZ]);
- printf("\t%-41s : %udb\n", "Attenuation at 7GHz",
- map->page_00h[CMIS_COPPER_ATT_7GHZ]);
- printf("\t%-41s : %udb\n", "Attenuation at 12.9GHz",
- map->page_00h[CMIS_COPPER_ATT_12P9GHZ]);
- printf("\t%-41s : %udb\n", "Attenuation at 25.8GHz",
- map->page_00h[CMIS_COPPER_ATT_25P8GHZ]);
+ module_print_any_uint("Attenuation at 5GHz",
+ map->page_00h[CMIS_COPPER_ATT_5GHZ], "db");
+ module_print_any_uint("Attenuation at 7GHz",
+ map->page_00h[CMIS_COPPER_ATT_7GHZ], "db");
+ module_print_any_uint("Attenuation at 12.9GHz",
+ map->page_00h[CMIS_COPPER_ATT_12P9GHZ],
+ "db");
+ module_print_any_uint("Attenuation at 25.8GHz",
+ map->page_00h[CMIS_COPPER_ATT_25P8GHZ],
+ "db");
} else if (map->page_01h) {
- printf("\t%-41s : %.3lfnm\n", "Laser wavelength",
- (((map->page_01h[CMIS_NOM_WAVELENGTH_MSB] << 8) |
- map->page_01h[CMIS_NOM_WAVELENGTH_LSB]) * 0.05));
- printf("\t%-41s : %.3lfnm\n", "Laser wavelength tolerance",
- (((map->page_01h[CMIS_WAVELENGTH_TOL_MSB] << 8) |
- map->page_01h[CMIS_WAVELENGTH_TOL_LSB]) * 0.005));
+ module_print_any_float("Laser wavelength",
+ (((map->page_01h[CMIS_NOM_WAVELENGTH_MSB] << 8) |
+ map->page_01h[CMIS_NOM_WAVELENGTH_LSB]) * 0.05),
+ "nm");
+ module_print_any_float("Laser wavelength tolerance",
+ (((map->page_01h[CMIS_WAVELENGTH_TOL_MSB] << 8) |
+ map->page_01h[CMIS_NOM_WAVELENGTH_LSB]) * 0.05),
+ "nm");
}
}
@@ -314,6 +330,8 @@ static void cmis_show_vendor_info(const struct cmis_memory_map *map)
CMIS_CLEI_END_OFFSET, "CLEI code");
}
+#define CMIS_MAX_DESC_LEN 64
+
/* Print the current Module State. Relevant documents:
* [1] CMIS Rev. 5, pag. 57, section 6.3.2.2, Figure 6-3
* [2] CMIS Rev. 5, pag. 60, section 6.3.2.3, Figure 6-4
@@ -321,31 +339,40 @@ static void cmis_show_vendor_info(const struct cmis_memory_map *map)
*/
static void cmis_show_mod_state(const struct cmis_memory_map *map)
{
+ char mod_state_description[CMIS_MAX_DESC_LEN];
__u8 mod_state;
mod_state = (map->lower_memory[CMIS_MODULE_STATE_OFFSET] &
CMIS_MODULE_STATE_MASK) >> 1;
- printf("\t%-41s : 0x%02x", "Module State", mod_state);
switch (mod_state) {
case CMIS_MODULE_STATE_MODULE_LOW_PWR:
- printf(" (ModuleLowPwr)\n");
+ strncpy(mod_state_description, "ModuleLowPwr",
+ CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_STATE_MODULE_PWR_UP:
- printf(" (ModulePwrUp)\n");
+ strncpy(mod_state_description, "ModulePwrUp",
+ CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_STATE_MODULE_READY:
- printf(" (ModuleReady)\n");
+ strncpy(mod_state_description, "ModuleReady",
+ CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_STATE_MODULE_PWR_DN:
- printf(" (ModulePwrDn)\n");
+ strncpy(mod_state_description, "ModulePwrDn",
+ CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_STATE_MODULE_FAULT:
- printf(" (ModuleFault)\n");
+ strncpy(mod_state_description, "ModuleFault",
+ CMIS_MAX_DESC_LEN);
break;
default:
- printf(" (reserved or unknown)\n");
+ strncpy(mod_state_description, "reserved or unknown",
+ CMIS_MAX_DESC_LEN);
break;
}
+
+ sff_print_any_hex_field("Module state", "module_state",
+ mod_state, mod_state_description);
}
/* Print the Module Fault Information. Relevant documents:
@@ -354,6 +381,7 @@ static void cmis_show_mod_state(const struct cmis_memory_map *map)
*/
static void cmis_show_mod_fault_cause(const struct cmis_memory_map *map)
{
+ char fault_cause_description[CMIS_MAX_DESC_LEN];
__u8 mod_state, fault_cause;
mod_state = (map->lower_memory[CMIS_MODULE_STATE_OFFSET] &
@@ -362,24 +390,31 @@ static void cmis_show_mod_fault_cause(const struct cmis_memory_map *map)
return;
fault_cause = map->lower_memory[CMIS_MODULE_FAULT_OFFSET];
- printf("\t%-41s : 0x%02x", "Module Fault Cause", fault_cause);
switch (fault_cause) {
case CMIS_MODULE_FAULT_NO_FAULT:
- printf(" (No fault detected / not supported)\n");
+ strncpy(fault_cause_description,
+ "No fault detected / not supported", CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_FAULT_TEC_RUNAWAY:
- printf(" (TEC runaway)\n");
+ strncpy(fault_cause_description, "TEC runaway",
+ CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_FAULT_DATA_MEM_CORRUPTED:
- printf(" (Data memory corrupted)\n");
+ strncpy(fault_cause_description, "Data memory corrupted",
+ CMIS_MAX_DESC_LEN);
break;
case CMIS_MODULE_FAULT_PROG_MEM_CORRUPTED:
- printf(" (Program memory corrupted)\n");
+ strncpy(fault_cause_description, "Program memory corrupted",
+ CMIS_MAX_DESC_LEN);
break;
default:
- printf(" (reserved or unknown)\n");
+ strncpy(fault_cause_description, "reserved or unknown",
+ CMIS_MAX_DESC_LEN);
break;
}
+
+ sff_print_any_hex_field("Module Fault Cause", "module_fault_cause",
+ fault_cause, fault_cause_description);
}
/* Print the current Module-Level Controls. Relevant documents:
@@ -388,12 +423,17 @@ static void cmis_show_mod_fault_cause(const struct cmis_memory_map *map)
*/
static void cmis_show_mod_lvl_controls(const struct cmis_memory_map *map)
{
- printf("\t%-41s : ", "LowPwrAllowRequestHW");
- printf("%s\n", ONOFF(map->lower_memory[CMIS_MODULE_CONTROL_OFFSET] &
- CMIS_LOW_PWR_ALLOW_REQUEST_HW_MASK));
- printf("\t%-41s : ", "LowPwrRequestSW");
- printf("%s\n", ONOFF(map->lower_memory[CMIS_MODULE_CONTROL_OFFSET] &
- CMIS_LOW_PWR_REQUEST_SW_MASK));
+ bool value;
+
+ value = map->lower_memory[CMIS_MODULE_CONTROL_OFFSET] &
+ CMIS_LOW_PWR_ALLOW_REQUEST_HW_MASK;
+ module_print_any_bool("LowPwrAllowRequestHW", "low_pwr_allow_request_hw",
+ value, ONOFF(value));
+
+ value = map->lower_memory[CMIS_MODULE_CONTROL_OFFSET] &
+ CMIS_LOW_PWR_REQUEST_SW_MASK;
+ module_print_any_bool("LowPwrRequestSW", "low_pwr_request_sw", value,
+ ONOFF(value));
}
static void cmis_parse_dom_power_type(const struct cmis_memory_map *map,
@@ -557,14 +597,25 @@ cmis_show_dom_chan_lvl_tx_bias_bank(const struct cmis_memory_map *map,
if (!page_11h)
return;
+ open_json_array("laser_tx_bias_current", "");
+
for (i = 0; i < CMIS_CHANNELS_PER_BANK; i++) {
int chan = bank * CMIS_CHANNELS_PER_BANK + i;
char fmt_str[80];
- snprintf(fmt_str, 80, "%s (Channel %d)",
- "Laser tx bias current", chan + 1);
- PRINT_BIAS(fmt_str, sd->scd[chan].bias_cur);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.3f",
+ (double)sd->scd[chan].bias_cur / 500.);
+ } else {
+ snprintf(fmt_str, 80, "%s (Channel %d)",
+ "Laser tx bias current", chan + 1);
+ PRINT_BIAS(fmt_str, sd->scd[chan].bias_cur);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units("laser_tx_bias_current", "mA");
}
static void cmis_show_dom_chan_lvl_tx_bias(const struct cmis_memory_map *map,
@@ -593,14 +644,25 @@ cmis_show_dom_chan_lvl_tx_power_bank(const struct cmis_memory_map *map,
if (!page_11h)
return;
+ open_json_array("transmit_avg_optical_power", "");
+
for (i = 0; i < CMIS_CHANNELS_PER_BANK; i++) {
int chan = bank * CMIS_CHANNELS_PER_BANK + i;
char fmt_str[80];
- snprintf(fmt_str, 80, "%s (Channel %d)",
- "Transmit avg optical power", chan + 1);
- PRINT_xX_PWR(fmt_str, sd->scd[chan].tx_power);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.4f",
+ (double)sd->scd[chan].tx_power / 10000.);
+ } else {
+ snprintf(fmt_str, 80, "%s (Channel %d)",
+ "Transmit avg optical power", chan + 1);
+ PRINT_xX_PWR(fmt_str, sd->scd[chan].tx_power);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units("transmit_avg_optical_power", "mW");
}
static void cmis_show_dom_chan_lvl_tx_power(const struct cmis_memory_map *map,
@@ -623,25 +685,39 @@ cmis_show_dom_chan_lvl_rx_power_bank(const struct cmis_memory_map *map,
const struct sff_diags *sd, int bank)
{
const __u8 *page_11h = map->upper_memory[bank][0x11];
+ char *rx_power_str;
int i;
if (!page_11h)
return;
+ if (!sd->rx_power_type)
+ rx_power_str = "Receiver signal OMA";
+ else
+ rx_power_str = "Rcvr signal avg optical power";
+
+ char rx_power_json_str[strlen(rx_power_str)];
+
+ convert_json_field_name(rx_power_str, rx_power_json_str);
+ open_json_array(rx_power_json_str, "");
+
for (i = 0; i < CMIS_CHANNELS_PER_BANK; i++) {
int chan = bank * CMIS_CHANNELS_PER_BANK + i;
- char *rx_power_str;
char fmt_str[80];
- if (!sd->rx_power_type)
- rx_power_str = "Receiver signal OMA";
- else
- rx_power_str = "Rcvr signal avg optical power";
-
- snprintf(fmt_str, 80, "%s (Channel %d)", rx_power_str,
- chan + 1);
- PRINT_xX_PWR(fmt_str, sd->scd[chan].rx_power);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.4f",
+ (double)sd->scd[chan].rx_power / 10000.);
+ } else {
+ snprintf(fmt_str, 80, "%s (Channel %d)", rx_power_str,
+ chan + 1);
+ PRINT_xX_PWR(fmt_str, sd->scd[chan].rx_power);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units(rx_power_json_str, "mW");
}
static void cmis_show_dom_chan_lvl_rx_power(const struct cmis_memory_map *map,
@@ -672,10 +748,13 @@ static void cmis_show_dom_mod_lvl_flags(const struct cmis_memory_map *map)
int i;
for (i = 0; module_aw_mod_flags[i].str; i++) {
- if (module_aw_mod_flags[i].type == MODULE_TYPE_CMIS)
- printf("\t%-41s : %s\n", module_aw_mod_flags[i].str,
- map->lower_memory[module_aw_mod_flags[i].offset] &
- module_aw_mod_flags[i].value ? "On" : "Off");
+ if (module_aw_mod_flags[i].type == MODULE_TYPE_CMIS) {
+ bool value = map->lower_memory[module_aw_mod_flags[i].offset] &
+ module_aw_mod_flags[i].value;
+
+ module_print_any_bool(module_aw_mod_flags[i].str, NULL,
+ value, ONOFF(value));
+ }
}
}
@@ -692,11 +771,16 @@ static void cmis_show_dom_chan_lvl_flag(const struct cmis_memory_map *map,
for (i = 0; i < CMIS_CHANNELS_PER_BANK; i++) {
int chan = bank * CMIS_CHANNELS_PER_BANK + i;
char str[80];
-
- snprintf(str, 80, module_aw_chan_flags[flag].fmt_str, chan + 1);
- printf("\t%-41s : %s\n", str,
- page_11h[module_aw_chan_flags[flag].offset] & chan ?
- "On" : "Off");
+ bool value;
+
+ value = page_11h[module_aw_chan_flags[flag].offset] & chan;
+ if (is_json_context()) {
+ print_bool(PRINT_JSON, NULL, NULL, value);
+ } else {
+ snprintf(str, 80, "%s (Chan %d)",
+ module_aw_chan_flags[flag].fmt_str, chan + 1);
+ printf("\t%-41s : %s\n", str, ONOFF(value));
+ }
}
}
@@ -711,11 +795,19 @@ cmis_show_dom_chan_lvl_flags_bank(const struct cmis_memory_map *map,
return;
for (flag = 0; module_aw_chan_flags[flag].fmt_str; flag++) {
- if (!(map->page_01h[module_aw_chan_flags[flag].adver_offset] &
- module_aw_chan_flags[flag].adver_value))
- continue;
-
- cmis_show_dom_chan_lvl_flag(map, bank, flag);
+ char json_str[80] = {};
+
+ if (module_aw_chan_flags[flag].type == MODULE_TYPE_CMIS) {
+ if (!(map->page_01h[module_aw_chan_flags[flag].adver_offset] &
+ module_aw_chan_flags[flag].adver_value))
+ continue;
+
+ convert_json_field_name(module_aw_chan_flags[flag].fmt_str,
+ json_str);
+ open_json_array(json_str, "");
+ cmis_show_dom_chan_lvl_flag(map, bank, flag);
+ close_json_array("");
+ }
}
}
@@ -745,8 +837,12 @@ static void cmis_show_dom(const struct cmis_memory_map *map)
cmis_show_dom_chan_lvl_monitors(map, &sd);
cmis_show_dom_mod_lvl_flags(map);
cmis_show_dom_chan_lvl_flags(map);
- if (sd.supports_alarms)
- sff_show_thresholds(sd);
+ if (sd.supports_alarms) {
+ if (is_json_context())
+ sff_show_thresholds_json(sd);
+ else
+ sff_show_thresholds(sd);
+ }
}
/* Print active and inactive firmware versions. Relevant documents:
@@ -756,14 +852,24 @@ static void cmis_show_dom(const struct cmis_memory_map *map)
static void cmis_show_fw_version_common(const char *name, __u8 major,
__u8 minor)
{
+ char json_fn[32] = "";
+
if (major == 0 && minor == 0) {
return;
} else if (major == 0xFF && minor == 0xFF) {
- printf("\t%-41s : Invalid\n", name);
+ module_print_any_string(name, "Invalid");
return;
}
- printf("\t%-41s : %d.%d\n", name, major, minor);
+ if (is_json_context()) {
+ convert_json_field_name(name, json_fn);
+ open_json_object(json_fn);
+ print_uint(PRINT_JSON, "major", "%u", major);
+ print_uint(PRINT_JSON, "minor", "%u", minor);
+ close_json_object();
+ } else {
+ printf("\t%-41s : %d.%d\n", name, major, minor);
+ }
}
static void cmis_show_fw_active_version(const struct cmis_memory_map *map)
@@ -811,7 +917,7 @@ static void cmis_show_cdb_instances(const struct cmis_memory_map *map)
{
__u8 cdb_instances = cmis_cdb_instances_get(map);
- printf("\t%-41s : %u\n", "CDB instances", cdb_instances);
+ module_print_any_uint("CDB instances", cdb_instances, NULL);
}
static void cmis_show_cdb_mode(const struct cmis_memory_map *map)
@@ -819,8 +925,8 @@ static void cmis_show_cdb_mode(const struct cmis_memory_map *map)
__u8 mode = map->page_01h[CMIS_CDB_ADVER_OFFSET] &
CMIS_CDB_ADVER_MODE_MASK;
- printf("\t%-41s : %s\n", "CDB background mode",
- mode ? "Supported" : "Not supported");
+ module_print_any_string("CDB background mode",
+ mode ? "Supported" : "Not supported");
}
static void cmis_show_cdb_epl_pages(const struct cmis_memory_map *map)
@@ -828,7 +934,7 @@ static void cmis_show_cdb_epl_pages(const struct cmis_memory_map *map)
__u8 epl_pages = map->page_01h[CMIS_CDB_ADVER_OFFSET] &
CMIS_CDB_ADVER_EPL_MASK;
- printf("\t%-41s : %u\n", "CDB EPL pages", epl_pages);
+ module_print_any_uint("CDB EPL pages", epl_pages, NULL);
}
static void cmis_show_cdb_rw_len(const struct cmis_memory_map *map)
@@ -839,9 +945,10 @@ static void cmis_show_cdb_rw_len(const struct cmis_memory_map *map)
* units of 8 bytes, in addition to the minimum 8 bytes.
*/
rw_len = (rw_len + 1) * 8;
- printf("\t%-41s : %u\n", "CDB Maximum EPL RW length", rw_len);
- printf("\t%-41s : %u\n", "CDB Maximum LPL RW length",
- rw_len > CMIS_PAGE_SIZE ? CMIS_PAGE_SIZE : rw_len);
+ module_print_any_uint("CDB Maximum EPL RW length", rw_len, NULL);
+ module_print_any_uint("CDB Maximum LPL RW length",
+ rw_len > CMIS_PAGE_SIZE ? CMIS_PAGE_SIZE : rw_len,
+ NULL);
}
static void cmis_show_cdb_trigger(const struct cmis_memory_map *map)
@@ -853,8 +960,8 @@ static void cmis_show_cdb_trigger(const struct cmis_memory_map *map)
* page, or by multiple writes ending with the writing of the CDB
* Command Code (CMDID).
*/
- printf("\t%-41s : %s\n", "CDB trigger method",
- trigger ? "Single write" : "Multiple writes");
+ module_print_any_string("CDB trigger method",
+ trigger ? "Single write" : "Multiple writes");
}
/* Print CDB messaging support advertisement. Relevant documents:
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (6 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 07/14] cmis: Add JSON output handling to --module-info in CMIS modules Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-27 20:12 ` Jakub Kicinski
2025-01-26 11:56 ` [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules Danielle Ratson
` (5 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
A sample output:
$ ethtool --json -m swp23
[ {
"identifier": 24,
"identifier_description": "QSFP-DD Double Density 8X Pluggable
Transceiver (INF-8628)",
"power_class": 5,
"max_power": 10.0000,
"max_power_units": "W",
"connector": 40,
"connector_description": "MPO 1x16",
"cable_assembly_length": 0.0000,
"cable_assembly_length_units": "m",
"tx_cdr_bypass_control": false,
"rx_cdr_bypass_control": false,
"tx_cdr": true,
"rx_cdr": true,
"transmitter_technology": 0,
"transmitter_technology_description": "850 nm VCSEL",
"laser_wavelength": 850.0000,
"laser_wavelength_units": "nm",
"laser_wavelength_tolerance": 94.8000,
"laser_wavelength_tolerance_units": "nm",
"length_(smf)": 0.0000,
"length_(smf)_units": "km",
"length_(om5)": 0,
"length_(om5)_units": "m",
"length_(om4)": 100,
"length_(om4)_units": "m",
"length_(om3_50/125um)": 70,
"length_(om3_50/125um)_units": "m",
"length_(om2_50/125um)": 0,
"length_(om2_50/125um)_units": "m",
"vendor_name": "FINISAR CORP.",
"vendor_oui": [ 0,144,101 ],
"vendor_pn": "FTCD8613E1PCM",
"vendor_rev": "A0",
"vendor_sn": "X6LBE6H",
"date_code": "211229__",
"revision_compliance": {
"major": 4,
"minor": 0
},
"rx_loss_of_signal": [
"Yes","Yes","Yes","Yes","Yes","Yes","Yes","Yes" ],
"tx_loss_of_signal": "None",
"rx_loss_of_lock": "None",
"tx_loss_of_lock": "None",
"tx_fault": "None",
"module_state": 3,
"module_state_description": "ModuleReady",
"low_pwr_allow_request_hw": false,
"low_pwr_request_sw": false,
"module_temperature": 36.8203,
"module_temperature_units": "degrees C",
"module_voltage": 3.3385,
"module_voltage_units": "V",
"laser_tx_bias_current": [
0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000 ],
"laser_tx_bias_current_units": "mA",
"transmit_avg_optical_power": [
0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001 ],
"transmit_avg_optical_power_units": "mW",
"rcvr_signal_avg_optical_power": [
0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001 ],
"rcvr_signal_avg_optical_power_units": "mW",
"module_temperature_high_alarm": false,
"module_temperature_low_alarm": false,
"module_temperature_high_warning": false,
"module_temperature_low_warning": false,
"module_voltage_high_alarm": false,
"module_voltage_low_alarm": false,
"module_voltage_high_warning": false,
"module_voltage_low_warning": false,
"laser_bias_current_high_alarm": [
false,false,false,false,false,false,false,false ],
"laser_bias_current_low_alarm": [
false,false,false,false,false,false,false,false ],
"laser_bias_current_high_warning": [
false,false,false,false,false,false,false,false ],
"laser_bias_current_low_warning": [
false,false,false,false,false,false,false,false ],
"laser_tx_power_high_alarm": [
false,false,false,false,false,false,false,false ],
"laser_tx_power_low_alarm": [
false,false,false,false,false,false,false,false ],
"laser_tx_power_high_warning": [
false,false,false,false,false,false,false,false ],
"laser_tx_power_low_warning": [
false,false,false,false,false,false,false,false ],
"laser_rx_power_high_alarm": [
false,false,false,false,false,false,false,false ],
"laser_rx_power_low_alarm": [
false,false,false,false,false,false,false,false ],
"laser_rx_power_high_warning": [
false,false,false,false,false,false,false,false ],
"laser_rx_power_low_warning": [
false,false,false,false,false,false,false,false ],
"laser_bias_current": {
"high_alarm_threshold": 13.0000,
"low_alarm_threshold": 3.0000,
"high_warning_threshold": 11.0000,
"low_warning_threshold": 5.0000,
"units": "mA"
},
"laser_output_power": {
"high_alarm_threshold": 3.1623,
"low_alarm_threshold": 0.1000,
"high_warning_threshold": 1.9953,
"low_warning_threshold": 0.1585,
"units": "mW"
},
"module_temperature": {
"high_alarm_threshold": 75.0000,
"low_alarm_threshold": -5.0000,
"high_warning_threshold": 70.0000,
"low_warning_threshold": 0.0000,
"units": "degrees C"
},
"module_voltage": {
"high_alarm_threshold": 3.4650,
"low_alarm_threshold": 3.1350,
"high_warning_threshold": 3.4500,
"low_warning_threshold": 3.1500,
"units": "V"
},
"laser_rx_power": {
"high_alarm_threshold": 3.1623,
"low_alarm_threshold": 0.0398,
"high_warning_threshold": 2.5119,
"low_warning_threshold": 0.0794,
"units": "mW"
},
"active_firmware_version": {
"major": 2,
"minor": 7
},
"inactive_firmware_version": {
"major": 2,
"minor": 7
},
"cdb_instances": 1,
"cdb_background_mode": "Supported",
"cdb_epl_pages": 0,
"cdb_maximum_epl_rw_length": 128,
"cdb_maximum_lpl_rw_length": 128,
"cdb_trigger_method": "Single write"
} ]
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
Reviewed-by: Amit Cohen <amcohen@nvidia.com>
---
cmis.c | 6 ++++++
ethtool.c | 1 +
2 files changed, 7 insertions(+)
diff --git a/cmis.c b/cmis.c
index 4901f57..f12548e 100644
--- a/cmis.c
+++ b/cmis.c
@@ -1129,10 +1129,16 @@ int cmis_show_all_nl(struct cmd_context *ctx)
struct cmis_memory_map map = {};
int ret;
+ new_json_obj(ctx->json);
+ open_json_object(NULL);
+
ret = cmis_memory_map_init_pages(ctx, &map);
if (ret < 0)
return ret;
cmis_show_all_common(&map);
+ close_json_object();
+ delete_json_obj();
+
return 0;
}
diff --git a/ethtool.c b/ethtool.c
index 225f3aa..2818206 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -6044,6 +6044,7 @@ static const struct option args[] = {
},
{
.opts = "-m|--dump-module-eeprom|--module-info",
+ .json = true,
.func = do_getmodule,
.nlfunc = nl_getmodule,
.help = "Query/Decode Module EEPROM information and optical diagnostics if available",
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-26 11:56 ` [PATCH ethtool-next 08/14] cmis: Enable JSON output support " Danielle Ratson
@ 2025-01-27 20:12 ` Jakub Kicinski
2025-01-28 13:18 ` Danielle Ratson
2025-01-29 9:40 ` Danielle Ratson
0 siblings, 2 replies; 39+ messages in thread
From: Jakub Kicinski @ 2025-01-27 20:12 UTC (permalink / raw)
To: Danielle Ratson; +Cc: netdev, mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw
On Sun, 26 Jan 2025 13:56:29 +0200 Danielle Ratson wrote:
> "tx_loss_of_signal": "None",
> "rx_loss_of_lock": "None",
> "tx_loss_of_lock": "None",
> "tx_fault": "None",
Why "None" in this case rather than true/false/null ?
> "module_state": 3,
> "module_state_description": "ModuleReady",
> "low_pwr_allow_request_hw": false,
> "low_pwr_request_sw": false,
> "module_temperature": 36.8203,
> "module_temperature_units": "degrees C",
> "module_voltage": 3.3385,
> "module_voltage_units": "V",
> "laser_tx_bias_current": [
> 0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000 ],
> "laser_tx_bias_current_units": "mA",
How do you think about the units?
If they may differ module to module - should we aim to normalize those?
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-27 20:12 ` Jakub Kicinski
@ 2025-01-28 13:18 ` Danielle Ratson
2025-01-28 22:09 ` Jakub Kicinski
2025-01-29 9:40 ` Danielle Ratson
1 sibling, 1 reply; 39+ messages in thread
From: Danielle Ratson @ 2025-01-28 13:18 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Monday, 27 January 2025 22:13
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <nbu-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in
> CMIS modules
>
> On Sun, 26 Jan 2025 13:56:29 +0200 Danielle Ratson wrote:
> > "tx_loss_of_signal": "None",
> > "rx_loss_of_lock": "None",
> > "tx_loss_of_lock": "None",
> > "tx_fault": "None",
>
> Why "None" in this case rather than true/false/null ?
>
> > "module_state": 3,
> > "module_state_description": "ModuleReady",
> > "low_pwr_allow_request_hw": false,
> > "low_pwr_request_sw": false,
> > "module_temperature": 36.8203,
> > "module_temperature_units": "degrees C",
> > "module_voltage": 3.3385,
> > "module_voltage_units": "V",
> > "laser_tx_bias_current": [
> > 0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000 ],
> > "laser_tx_bias_current_units": "mA",
>
> How do you think about the units?
> If they may differ module to module - should we aim to normalize those?
Not sure if I understand what you mean. What do you wish to normalize and how?
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-28 13:18 ` Danielle Ratson
@ 2025-01-28 22:09 ` Jakub Kicinski
2025-01-29 7:06 ` Danielle Ratson
0 siblings, 1 reply; 39+ messages in thread
From: Jakub Kicinski @ 2025-01-28 22:09 UTC (permalink / raw)
To: Danielle Ratson
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
On Tue, 28 Jan 2025 13:18:54 +0000 Danielle Ratson wrote:
> > > "module_state": 3,
> > > "module_state_description": "ModuleReady",
> > > "low_pwr_allow_request_hw": false,
> > > "low_pwr_request_sw": false,
> > > "module_temperature": 36.8203,
> > > "module_temperature_units": "degrees C",
> > > "module_voltage": 3.3385,
> > > "module_voltage_units": "V",
> > > "laser_tx_bias_current": [
> > > 0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000 ],
> > > "laser_tx_bias_current_units": "mA",
> >
> > How do you think about the units?
> > If they may differ module to module - should we aim to normalize those?
>
> Not sure if I understand what you mean. What do you wish to normalize and how?
I don't understand the "_units" keys, basically:
"max_power": 10.0000,
"max_power_units": "W", <<
[...]
"low_warning_threshold": 0.1585,
"units": "mW" <<
or:
"length_(smf)": 0.0000,
"length_(smf)_units": "km", <<
"length_(om5)": 0,
"length_(om5)_units": "m", <<
What are these for?
Is the consumer of the JSON output supposed to be parsing the units
and making sure to scale the values every time it reads (e.g. divide
by 1000 if it wants W but unit is mW)?
Or the unit is fully implied by the key, and can't change? IOW the unit
is only listed so that the human writing the consumer can figure out
the unit and then hardcode it?
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-28 22:09 ` Jakub Kicinski
@ 2025-01-29 7:06 ` Danielle Ratson
2025-01-30 1:17 ` Jakub Kicinski
0 siblings, 1 reply; 39+ messages in thread
From: Danielle Ratson @ 2025-01-29 7:06 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Wednesday, 29 January 2025 0:09
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <NBU-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in
> CMIS modules
>
> On Tue, 28 Jan 2025 13:18:54 +0000 Danielle Ratson wrote:
> > > > "module_state": 3,
> > > > "module_state_description": "ModuleReady",
> > > > "low_pwr_allow_request_hw": false,
> > > > "low_pwr_request_sw": false,
> > > > "module_temperature": 36.8203,
> > > > "module_temperature_units": "degrees C",
> > > > "module_voltage": 3.3385,
> > > > "module_voltage_units": "V",
> > > > "laser_tx_bias_current": [
> > > > 0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000 ],
> > > > "laser_tx_bias_current_units": "mA",
> > >
> > > How do you think about the units?
> > > If they may differ module to module - should we aim to normalize those?
> >
> > Not sure if I understand what you mean. What do you wish to normalize and
> how?
>
> I don't understand the "_units" keys, basically:
>
> "max_power": 10.0000,
> "max_power_units": "W", <<
> [...]
> "low_warning_threshold": 0.1585,
> "units": "mW" <<
>
> or:
>
> "length_(smf)": 0.0000,
> "length_(smf)_units": "km", <<
> "length_(om5)": 0,
> "length_(om5)_units": "m", <<
>
> What are these for?
>
> Is the consumer of the JSON output supposed to be parsing the units and
> making sure to scale the values every time it reads (e.g. divide by 1000 if it
> wants W but unit is mW)?
>
> Or the unit is fully implied by the key, and can't change? IOW the unit is only
> listed so that the human writing the consumer can figure out the unit and then
> hardcode it?
Yes, the unit is implied by the key is hardcoded. Same as for the regular output, it should give the costumer idea about the scale.
There are also temperature fields that could be either F or C degrees. So overall , the units fields should align all the fields that implies some sort of scale.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-29 7:06 ` Danielle Ratson
@ 2025-01-30 1:17 ` Jakub Kicinski
2025-01-30 12:38 ` Danielle Ratson
0 siblings, 1 reply; 39+ messages in thread
From: Jakub Kicinski @ 2025-01-30 1:17 UTC (permalink / raw)
To: Danielle Ratson
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
On Wed, 29 Jan 2025 07:06:09 +0000 Danielle Ratson wrote:
> > Is the consumer of the JSON output supposed to be parsing the units and
> > making sure to scale the values every time it reads (e.g. divide by 1000 if it
> > wants W but unit is mW)?
> >
> > Or the unit is fully implied by the key, and can't change? IOW the unit is only
> > listed so that the human writing the consumer can figure out the unit and then
> > hardcode it?
>
> Yes, the unit is implied by the key is hardcoded. Same as for the
> regular output, it should give the costumer idea about the scale.
> There are also temperature fields that could be either F or C
> degrees. So overall , the units fields should align all the fields
> that implies some sort of scale.
Some sort of a schema would be a better place to document the unit
of the fields, IMO.
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-30 1:17 ` Jakub Kicinski
@ 2025-01-30 12:38 ` Danielle Ratson
2025-01-30 16:24 ` Jakub Kicinski
0 siblings, 1 reply; 39+ messages in thread
From: Danielle Ratson @ 2025-01-30 12:38 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Thursday, 30 January 2025 3:17
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <NBU-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in
> CMIS modules
>
> On Wed, 29 Jan 2025 07:06:09 +0000 Danielle Ratson wrote:
> > > Is the consumer of the JSON output supposed to be parsing the units
> > > and making sure to scale the values every time it reads (e.g. divide
> > > by 1000 if it wants W but unit is mW)?
> > >
> > > Or the unit is fully implied by the key, and can't change? IOW the
> > > unit is only listed so that the human writing the consumer can
> > > figure out the unit and then hardcode it?
> >
> > Yes, the unit is implied by the key is hardcoded. Same as for the
> > regular output, it should give the costumer idea about the scale.
> > There are also temperature fields that could be either F or C degrees.
> > So overall , the units fields should align all the fields that implies
> > some sort of scale.
>
> Some sort of a schema would be a better place to document the unit of the
> fields, IMO.
So should the units fields be removed entirely? And only be documented in the json schema file?
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-30 12:38 ` Danielle Ratson
@ 2025-01-30 16:24 ` Jakub Kicinski
2025-01-30 17:20 ` Andrew Lunn
2025-02-02 18:22 ` Danielle Ratson
0 siblings, 2 replies; 39+ messages in thread
From: Jakub Kicinski @ 2025-01-30 16:24 UTC (permalink / raw)
To: Danielle Ratson
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
On Thu, 30 Jan 2025 12:38:56 +0000 Danielle Ratson wrote:
> > > Yes, the unit is implied by the key is hardcoded. Same as for the
> > > regular output, it should give the costumer idea about the scale.
> > > There are also temperature fields that could be either F or C degrees.
> > > So overall , the units fields should align all the fields that implies
> > > some sort of scale.
> >
> > Some sort of a schema would be a better place to document the unit of the
> > fields, IMO.
>
> So should the units fields be removed entirely? And only be
> documented in the json schema file?
Yes, more than happy to hear from others but a schema file would
be my first choice. Short of that as long as the unit is the same
as in the plain text output there should also not be any ambiguity.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-30 16:24 ` Jakub Kicinski
@ 2025-01-30 17:20 ` Andrew Lunn
2025-02-02 18:22 ` Danielle Ratson
1 sibling, 0 replies; 39+ messages in thread
From: Andrew Lunn @ 2025-01-30 17:20 UTC (permalink / raw)
To: Jakub Kicinski
Cc: Danielle Ratson, netdev@vger.kernel.org, mkubecek@suse.cz,
matt@traverse.com.au, daniel.zahka@gmail.com, Amit Cohen,
NBU-mlxsw
On Thu, Jan 30, 2025 at 08:24:35AM -0800, Jakub Kicinski wrote:
> On Thu, 30 Jan 2025 12:38:56 +0000 Danielle Ratson wrote:
> > > > Yes, the unit is implied by the key is hardcoded. Same as for the
> > > > regular output, it should give the costumer idea about the scale.
> > > > There are also temperature fields that could be either F or C degrees.
> > > > So overall , the units fields should align all the fields that implies
> > > > some sort of scale.
> > >
> > > Some sort of a schema would be a better place to document the unit of the
> > > fields, IMO.
> >
> > So should the units fields be removed entirely? And only be
> > documented in the json schema file?
>
> Yes, more than happy to hear from others but a schema file would
> be my first choice. Short of that as long as the unit is the same
> as in the plain text output there should also not be any ambiguity.
Sorry, not been monitoring this patchset.
If units are an issue, you could just use the standard units hwmon
uses. milli centigrade, milli amps, milli volts, micro watts, micro
joule, etc. I don't think hwmon has needed to handle distances, but
milli meter seems like the obvious choice given this pattern, although
160km in millimeters is a rather big number.
Andrew
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-30 16:24 ` Jakub Kicinski
2025-01-30 17:20 ` Andrew Lunn
@ 2025-02-02 18:22 ` Danielle Ratson
2025-02-02 19:40 ` Andrew Lunn
2025-02-03 20:59 ` Jakub Kicinski
1 sibling, 2 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-02-02 18:22 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Thursday, 30 January 2025 18:25
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <NBU-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in
> CMIS modules
>
> On Thu, 30 Jan 2025 12:38:56 +0000 Danielle Ratson wrote:
> > > > Yes, the unit is implied by the key is hardcoded. Same as for the
> > > > regular output, it should give the costumer idea about the scale.
> > > > There are also temperature fields that could be either F or C degrees.
> > > > So overall , the units fields should align all the fields that
> > > > implies some sort of scale.
> > >
> > > Some sort of a schema would be a better place to document the unit
> > > of the fields, IMO.
> >
> > So should the units fields be removed entirely? And only be
> > documented in the json schema file?
>
> Yes, more than happy to hear from others but a schema file would be my first
> choice. Short of that as long as the unit is the same as in the plain text output
> there should also not be any ambiguity.
This is the output without the units fields:
$ ethtool -j -m swp23
[ {
"identifier": 24,
"identifier_description": "QSFP-DD Double Density 8X Pluggable Transceiver (INF-8628)",
"power_class": 5,
"max_power": 10,
"connector": 40,
"connector_description": "MPO 1x16",
"cable_assembly_length": 0,
"tx_cdr_bypass_control": false,
"rx_cdr_bypass_control": false,
"tx_cdr": true,
"rx_cdr": true,
"transmitter_technology": 0,
"transmitter_technology_description": "850 nm VCSEL",
"laser_wavelength": 850,
"laser_wavelength_tolerance": 94.8,
"length_(smf)": 0,
"length_(om5)": 0,
"length_(om4)": 100,
"length_(om3)": 70,
"length_(om2)": 0,
"vendor_name": "FINISAR CORP.",
"vendor_oui": [ 0,144,101 ],
"vendor_pn": "FTCD8613E1PCM",
"vendor_rev": "A0",
"vendor_sn": "X6LBE6H",
"date_code": "211229__",
"revision_compliance": {
"major": 4,
"minor": 0
},
"rx_loss_of_signal": [ "Yes","Yes","Yes","Yes","Yes","Yes","Yes","Yes" ],
"tx_loss_of_signal": false,
"rx_loss_of_lock": false,
"tx_loss_of_lock": false,
"tx_fault": false,
"module_state": 3,
"module_state_description": "ModuleReady",
"low_pwr_allow_request_hw": false,
"low_pwr_request_sw": false,
"module_temperature": 37.3477,
"module_voltage": 3.3406,
"laser_tx_bias_current": [ 0,0,0,0,0,0,0,0 ],
"transmit_avg_optical_power": [ 0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001 ],
"rx_power": {
"values": [ 0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001,0.0001 ],
"type": "Rcvr signal avg optical power"
},
"module_temperature_high_alarm": false,
"module_temperature_low_alarm": false,
"module_temperature_high_warning": false,
"module_temperature_low_warning": false,
"module_voltage_high_alarm": false,
"module_voltage_low_alarm": false,
"module_voltage_high_warning": false,
"module_voltage_low_warning": false,
"laser_bias_current_high_alarm": [ false,false,false,false,false,false,false,false ],
"laser_bias_current_low_alarm": [ false,false,false,false,false,false,false,false ],
"laser_bias_current_high_warning": [ false,false,false,false,false,false,false,false ],
"laser_bias_current_low_warning": [ false,false,false,false,false,false,false,false ],
"laser_tx_power_high_alarm": [ false,false,false,false,false,false,false,false ],
"laser_tx_power_low_alarm": [ false,false,false,false,false,false,false,false ],
"laser_tx_power_high_warning": [ false,false,false,false,false,false,false,false ],
"laser_tx_power_low_warning": [ false,false,false,false,false,false,false,false ],
"laser_rx_power_high_alarm": [ false,false,false,false,false,false,false,false ],
"laser_rx_power_low_alarm": [ false,false,false,false,false,false,false,false ],
"laser_rx_power_high_warning": [ false,false,false,false,false,false,false,false ],
"laser_rx_power_low_warning": [ false,false,false,false,false,false,false,false ],
"laser_bias_current": {
"high_alarm_threshold": 13,
"low_alarm_threshold": 3,
"high_warning_threshold": 11,
"low_warning_threshold": 5
},
"laser_output_power": {
"high_alarm_threshold": 3.1623,
"low_alarm_threshold": 0.1,
"high_warning_threshold": 1.9953,
"low_warning_threshold": 0.1585
},
"module_temperature": {
"high_alarm_threshold": 75,
"low_alarm_threshold": -5,
"high_warning_threshold": 70,
"low_warning_threshold": 0
},
"module_voltage": {
"high_alarm_threshold": 3.465,
"low_alarm_threshold": 3.135,
"high_warning_threshold": 3.45,
"low_warning_threshold": 3.15
},
"laser_rx_power": {
"high_alarm_threshold": 3.1623,
"low_alarm_threshold": 0.0398,
"high_warning_threshold": 2.5119,
"low_warning_threshold": 0.0794
},
"active_firmware_version": {
"major": 2,
"minor": 7
},
"inactive_firmware_version": {
"major": 2,
"minor": 7
},
"cdb_instances": 1,
"cdb_background_mode": "Supported",
"cdb_epl_pages": 0,
"cdb_maximum_epl_rw_length": 128,
"cdb_maximum_lpl_rw_length": 128,
"cdb_trigger_method": "Single write"
} ]
And here is a schema file that should match the dump:
cat module_info.json
{
"$schema": "https://json-schema.org/draft/2020-12/schema",
"title": "Ethtool module-info JSON Output Schema",
"type": "array",
"items": {
"type": "object",
"properties": {
"br_nominal_units": {
"type": "string",
"enum": ["Mbps"] },
"length_(smf)_units": {
"type": "string",
"enum": ["km"] },
"length_(om5)_units": {
"type": "string",
"enum": ["m"] },
"length_(om4)_units": {
"type": "string",
"enum": ["m"] },
"length_(om3)_units": {
"type": "string",
"enum": ["m"] },
"length_(om2)_units": {
"type": "string",
"enum": ["m"] },
"length_(om1)_units": {
"type": "string",
"enum": ["m"] },
"length_(copper_or_active_cable)_units": {
"type": "string",
"enum": ["m"] },
"laser_wavelength_units": {
"type": "string",
"enum": ["nm"] },
"laser_wavelength_tolerance_units": {
"type": "string",
"enum": ["nm"] },
"module_temperature_units": {
"type": "string",
"enum": ["degrees C"] },
"module_voltage_units": {
"type": "string",
"enum": ["V"] },
"laser_tx_bias_current_units": {
"type": "string",
"enum": ["mA"] },
"transmit_avg_optical_power_units": {
"type": "string",
"enum": ["mW"] },
"rx_power": {
"type": "object",
"properties": {
"units": {
"type": "string",
"enum": ["mW"] }
},
"required": ["units"]
},
"laser_bias_current": {
"type": "object",
"properties": {
"units": {
"type": "string",
"enum": ["mA"] }
},
"required": ["units"]
},
"laser_output_power": {
"type": "object",
"properties": {
"units": {
"type": "string",
"enum": ["mW"] }
},
"required": ["units"]
},
"module_temperature": {
"type": "object",
"properties": {
"units": {
"type": "string",
"enum": ["degrees C"] }
},
"required": ["units"]
},
"module_voltage": {
"type": "object",
"properties": {
"units": {
"type": "string",
"enum": ["V"] }
},
"required": ["units"]
},
"laser_rx_power": {
"type": "object",
"properties": {
"units": {
"type": "string",
"enum": ["mW"] }
},
"required": ["units"]
}
},
"required": [
"br_nominal_units", "length_(smf)_units",
"length_(om5)_units", "length_(om4)_units",
"length_(om3)_units", "length_(om2)_units",
"length_(om1)_units",
"length_(copper_or_active_cable)_units",
"laser_wavelength_units",
"laser_wavelength_tolerance_units",
"module_temperature_units", "module_voltage_units",
"laser_tx_bias_current_units",
"transmit_avg_optical_power_units", "rx_power",
"laser_bias_current", "laser_output_power",
"module_temperature", "module_voltage", "laser_rx_power"
]
}
}
Does it look reasonable to you? As I understand, this is a standalone file, the is only relevant for documentation, so nothing supposed to be missing besides removing the units fields from the code.
Thanks!
Danielle
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-02-02 18:22 ` Danielle Ratson
@ 2025-02-02 19:40 ` Andrew Lunn
2025-02-03 9:58 ` Danielle Ratson
2025-02-03 20:59 ` Jakub Kicinski
1 sibling, 1 reply; 39+ messages in thread
From: Andrew Lunn @ 2025-02-02 19:40 UTC (permalink / raw)
To: Danielle Ratson
Cc: Jakub Kicinski, netdev@vger.kernel.org, mkubecek@suse.cz,
matt@traverse.com.au, daniel.zahka@gmail.com, Amit Cohen,
NBU-mlxsw
> "module_temperature": 37.3477,
> "module_voltage": 3.3406,
Device tree often puts the units in the property name. module_temperature_C, module_voltage_v,
> "laser_bias_current": {
> "high_alarm_threshold": 13,
> "low_alarm_threshold": 3,
> "high_warning_threshold": 11,
> "low_warning_threshold": 5
"high_alarm_threshold_mA": 13,
> },
> "laser_output_power": {
> "high_alarm_threshold": 3.1623,
> "low_alarm_threshold": 0.1,
> "high_warning_threshold": 1.9953,
> "low_warning_threshold": 0.1585
> },
"high_alarm_threshold_W": 3.1623,
> "module_temperature": {
> "high_alarm_threshold": 75,
> "low_alarm_threshold": -5,
> "high_warning_threshold": 70,
> "low_warning_threshold": 0
> },
"high_alarm_threshold_C": 75,
etc. This makes it more self contained.
Andrew
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-02-02 19:40 ` Andrew Lunn
@ 2025-02-03 9:58 ` Danielle Ratson
0 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-02-03 9:58 UTC (permalink / raw)
To: Andrew Lunn
Cc: Jakub Kicinski, netdev@vger.kernel.org, mkubecek@suse.cz,
matt@traverse.com.au, daniel.zahka@gmail.com, Amit Cohen,
NBU-mlxsw
> From: Andrew Lunn <andrew@lunn.ch>
> Sent: Sunday, 2 February 2025 21:41
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: Jakub Kicinski <kuba@kernel.org>; netdev@vger.kernel.org;
> mkubecek@suse.cz; matt@traverse.com.au; daniel.zahka@gmail.com; Amit
> Cohen <amcohen@nvidia.com>; NBU-mlxsw <NBU-
> mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in
> CMIS modules
>
> > "module_temperature": 37.3477,
> > "module_voltage": 3.3406,
>
> Device tree often puts the units in the property name.
> module_temperature_C, module_voltage_v,
>
> > "laser_bias_current": {
> > "high_alarm_threshold": 13,
> > "low_alarm_threshold": 3,
> > "high_warning_threshold": 11,
> > "low_warning_threshold": 5
>
> "high_alarm_threshold_mA": 13,
>
>
> > },
> > "laser_output_power": {
> > "high_alarm_threshold": 3.1623,
> > "low_alarm_threshold": 0.1,
> > "high_warning_threshold": 1.9953,
> > "low_warning_threshold": 0.1585
> > },
>
> "high_alarm_threshold_W": 3.1623,
>
>
> > "module_temperature": {
> > "high_alarm_threshold": 75,
> > "low_alarm_threshold": -5,
> > "high_warning_threshold": 70,
> > "low_warning_threshold": 0
> > },
>
> "high_alarm_threshold_C": 75,
>
> etc. This makes it more self contained.
>
> Andrew
I suggested to have a separate field for units in the json output. It makes sense since it can be easily tracked by a machine and also it is aligned with the regular output.
Jakub offered to remove those fields from the output at all. And use a separate file for documenting those fields. In that case we are still aligned with regular output.
But in your suggestion, we should use a different naming convention in the JSON output, which not only complicates the code but is also confusing.
I think we should stick to the first 2 options.
Thanks.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-02-02 18:22 ` Danielle Ratson
2025-02-02 19:40 ` Andrew Lunn
@ 2025-02-03 20:59 ` Jakub Kicinski
1 sibling, 0 replies; 39+ messages in thread
From: Jakub Kicinski @ 2025-02-03 20:59 UTC (permalink / raw)
To: Danielle Ratson
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
On Sun, 2 Feb 2025 18:22:18 +0000 Danielle Ratson wrote:
> "type": "object",
> "properties": {
> "br_nominal_units": {
> "type": "string",
> "enum": ["Mbps"] },
> "length_(smf)_units": {
> "type": "string",
> "enum": ["km"] },
> "length_(om5)_units": {
> "type": "string",
> "enum": ["m"] },
> "length_(om4)_units": {
> "type": "string",
> "enum": ["m"] },
> "length_(om3)_units": {
> "type": "string",
> "enum": ["m"] },
Hm. I would have expected properties to match the main output.
So:
"type": "object",
"properties": {
"br_nominal": {
"type": "string",
"description": "Nominal bitrate. Unit: Mbps" },
"length_(smf)": {
"type": "string",
"description": "Unit: km" },
"length_(om5)": {
"type": "string",
"description": "Unit: m" },
"length_(om4)": {
"type": "string",
"description": "Unit: m" },
"length_(om3)": {
"type": "string",
"description": "Unit: m" },
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in CMIS modules
2025-01-27 20:12 ` Jakub Kicinski
2025-01-28 13:18 ` Danielle Ratson
@ 2025-01-29 9:40 ` Danielle Ratson
1 sibling, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-29 9:40 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Monday, 27 January 2025 22:13
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <nbu-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 08/14] cmis: Enable JSON output support in
> CMIS modules
>
> On Sun, 26 Jan 2025 13:56:29 +0200 Danielle Ratson wrote:
> > "tx_loss_of_signal": "None",
> > "rx_loss_of_lock": "None",
> > "tx_loss_of_lock": "None",
> > "tx_fault": "None",
>
> Why "None" in this case rather than true/false/null ?
Alignment again.. I can change it to false, but null seems not here and not there.
>
> > "module_state": 3,
> > "module_state_description": "ModuleReady",
> > "low_pwr_allow_request_hw": false,
> > "low_pwr_request_sw": false,
> > "module_temperature": 36.8203,
> > "module_temperature_units": "degrees C",
> > "module_voltage": 3.3385,
> > "module_voltage_units": "V",
> > "laser_tx_bias_current": [
> > 0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000,0.0000 ],
> > "laser_tx_bias_current_units": "mA",
>
> How do you think about the units?
> If they may differ module to module - should we aim to normalize those?
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (7 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 08/14] cmis: Enable JSON output support " Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-27 20:16 ` Jakub Kicinski
2025-01-26 11:56 ` [PATCH ethtool-next 10/14] qsfp: Enable JSON output support for " Danielle Ratson
` (4 subsequent siblings)
13 siblings, 1 reply; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Add JSON output handling for 'ethtool -m' / --module-info, following the
guideline below:
1. Fields with description, will have a separate description field.
2. Fields with units, will have a separate unit field.
3. ASCII fields will be presented as strings.
4. On/Off is rendered as true/false.
5. Yes/no is rendered as true/false.
6. Per-channel fields will be presented as array, when each element
represents a channel.
7. Fields that hold version, will be split to major and minor sub fields.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
cmis.h | 3 +
qsfp.c | 538 +++++++++++++++++++++++++++++++++++----------------------
2 files changed, 337 insertions(+), 204 deletions(-)
diff --git a/cmis.h b/cmis.h
index 007632a..d2b3d24 100644
--- a/cmis.h
+++ b/cmis.h
@@ -199,6 +199,9 @@
#define CMIS_RX_PWR_HWARN_OFFSET 0xC4
#define CMIS_RX_PWR_LWARN_OFFSET 0xC6
+#define YESNO(x) (((x) != 0) ? "Yes" : "No")
+#define ONOFF(x) (((x) != 0) ? "On" : "Off")
+
void cmis_show_all_ioctl(const __u8 *id);
int cmis_show_all_nl(struct cmd_context *ctx);
diff --git a/qsfp.c b/qsfp.c
index 13d8fb7..d835067 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -82,64 +82,92 @@ static void sff8636_show_identifier(const struct sff8636_memory_map *map)
static void sff8636_show_ext_identifier(const struct sff8636_memory_map *map)
{
- printf("\t%-41s : 0x%02x\n", "Extended identifier",
- map->page_00h[SFF8636_EXT_ID_OFFSET]);
-
static const char *pfx =
"\tExtended identifier description :";
+ char description[64];
+
+ if (is_json_context()) {
+ open_json_object("extended_identifier");
+ print_int(PRINT_JSON, "value", "0x%02x",
+ map->page_00h[SFF8636_EXT_ID_OFFSET]);
+ } else {
+ printf("\t%-41s : 0x%02x\n", "Extended identifier",
+ map->page_00h[SFF8636_EXT_ID_OFFSET]);
+ }
switch (map->page_00h[SFF8636_EXT_ID_OFFSET] &
SFF8636_EXT_ID_PWR_CLASS_MASK) {
case SFF8636_EXT_ID_PWR_CLASS_1:
- printf("%s 1.5W max. Power consumption\n", pfx);
+ strncpy(description, "1.5W max. Power consumption", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_2:
- printf("%s 2.0W max. Power consumption\n", pfx);
+ strncpy(description, "1.5W max. Power consumption", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_3:
- printf("%s 2.5W max. Power consumption\n", pfx);
+ strncpy(description, "2.5W max. Power consumption", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_4:
- printf("%s 3.5W max. Power consumption\n", pfx);
+ strncpy(description, "3.5W max. Power consumption", 64);
break;
}
+ if (is_json_context())
+ print_string(PRINT_JSON, "description", "%s", description);
+ else
+ printf("%s %s\n", pfx, description);
+
if (map->page_00h[SFF8636_EXT_ID_OFFSET] & SFF8636_EXT_ID_CDR_TX_MASK)
- printf("%s CDR present in TX,", pfx);
+ strncpy(description, "CDR present in TX,", 64);
else
- printf("%s No CDR in TX,", pfx);
+ strncpy(description, "No CDR in TX,", 64);
if (map->page_00h[SFF8636_EXT_ID_OFFSET] & SFF8636_EXT_ID_CDR_RX_MASK)
- printf(" CDR present in RX\n");
+ strcat(description, " CDR present in RX");
+ else
+ strcat(description, " No CDR in RX");
+
+ if (is_json_context())
+ print_string(PRINT_JSON, "description", "%s", description);
else
- printf(" No CDR in RX\n");
+ printf("%s %s\n", pfx, description);
switch (map->page_00h[SFF8636_EXT_ID_OFFSET] &
SFF8636_EXT_ID_EPWR_CLASS_MASK) {
case SFF8636_EXT_ID_PWR_CLASS_LEGACY:
- printf("%s", pfx);
+ strncpy(description, "", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_5:
- printf("%s 4.0W max. Power consumption,", pfx);
+ strncpy(description, "4.0W max. Power consumption,", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_6:
- printf("%s 4.5W max. Power consumption, ", pfx);
+ strncpy(description, "4.5W max. Power consumption,", 64);
break;
case SFF8636_EXT_ID_PWR_CLASS_7:
- printf("%s 5.0W max. Power consumption, ", pfx);
+ strncpy(description, "5.0W max. Power consumption,", 64);
break;
}
+
if (map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
SFF8636_HIGH_PWR_ENABLE)
- printf(" High Power Class (> 3.5 W) enabled\n");
+ strcat(description, " High Power Class (> 3.5 W) enabled");
else
- printf(" High Power Class (> 3.5 W) not enabled\n");
- printf("\t%-41s : ", "Power set");
- printf("%s\n", ONOFF(map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
- SFF8636_LOW_PWR_SET));
- printf("\t%-41s : ", "Power override");
- printf("%s\n", ONOFF(map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
- SFF8636_PWR_OVERRIDE));
+ strcat(description,
+ " High Power Class (> 3.5 W) not enabled");
+
+ if (is_json_context())
+ print_string(PRINT_JSON, "description", "%s", description);
+ else
+ printf("%s %s\n", pfx, description);
+
+ close_json_object();
+
+ bool value = map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
+ SFF8636_LOW_PWR_SET;
+ module_print_any_bool("Power set", "power_set", value, ONOFF(value));
+ value = map->lower_memory[SFF8636_PWR_MODE_OFFSET] &
+ SFF8636_PWR_OVERRIDE;
+ module_print_any_bool("Power override", "power_override", value,
+ ONOFF(value));
}
static void sff8636_show_connector(const struct sff8636_memory_map *map)
@@ -149,232 +177,262 @@ static void sff8636_show_connector(const struct sff8636_memory_map *map)
static void sff8636_show_transceiver(const struct sff8636_memory_map *map)
{
- static const char *pfx =
- "\tTransceiver type :";
-
- printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
- "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
- "Transceiver codes",
- map->page_00h[SFF8636_ETHERNET_COMP_OFFSET],
- map->page_00h[SFF8636_SONET_COMP_OFFSET],
- map->page_00h[SFF8636_SAS_COMP_OFFSET],
- map->page_00h[SFF8636_GIGE_COMP_OFFSET],
- map->page_00h[SFF8636_FC_LEN_OFFSET],
- map->page_00h[SFF8636_FC_TECH_OFFSET],
- map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET],
- map->page_00h[SFF8636_FC_SPEED_OFFSET]);
+ static const char *pfx = "Transceiver type";
+ char value[140] = "";
+
+ if (is_json_context()) {
+ open_json_array("transceiver_codes", "");
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_ETHERNET_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_SONET_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_SAS_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_GIGE_COMP_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_LEN_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_TECH_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET]);
+ print_int(PRINT_JSON, NULL, "0x%02x",
+ map->page_00h[SFF8636_FC_SPEED_OFFSET]);
+ close_json_array("");
+ } else {
+ printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
+ "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
+ "Transceiver codes",
+ map->page_00h[SFF8636_ETHERNET_COMP_OFFSET],
+ map->page_00h[SFF8636_SONET_COMP_OFFSET],
+ map->page_00h[SFF8636_SAS_COMP_OFFSET],
+ map->page_00h[SFF8636_GIGE_COMP_OFFSET],
+ map->page_00h[SFF8636_FC_LEN_OFFSET],
+ map->page_00h[SFF8636_FC_TECH_OFFSET],
+ map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET],
+ map->page_00h[SFF8636_FC_SPEED_OFFSET]);
+ }
/* 10G/40G Ethernet Compliance Codes */
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_10G_LRM)
- printf("%s 10G Ethernet: 10G Base-LRM\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LRM");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_10G_LR)
- printf("%s 10G Ethernet: 10G Base-LR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LR");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_10G_SR)
- printf("%s 10G Ethernet: 10G Base-SR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-SR");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_CR4)
- printf("%s 40G Ethernet: 40G Base-CR4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-CR4");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_SR4)
- printf("%s 40G Ethernet: 40G Base-SR4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-SR4");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_LR4)
- printf("%s 40G Ethernet: 40G Base-LR4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-LR4");
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_40G_ACTIVE)
- printf("%s 40G Ethernet: 40G Active Cable (XLPPI)\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Active Cable (XLPPI)");
/* Extended Specification Compliance Codes from SFF-8024 */
if (map->page_00h[SFF8636_ETHERNET_COMP_OFFSET] &
SFF8636_ETHERNET_RSRVD) {
switch (map->page_00h[SFF8636_OPTION_1_OFFSET]) {
case SFF8636_ETHERNET_UNSPECIFIED:
- printf("%s (reserved or unknown)\n", pfx);
+ sprintf(value, "%s", "(reserved or unknown)");
break;
case SFF8636_ETHERNET_100G_AOC:
- printf("%s 100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)");
break;
case SFF8636_ETHERNET_100G_SR4:
- printf("%s 100G Ethernet: 100G Base-SR4 or 25GBase-SR\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G Base-SR4 or 25GBase-SR");
break;
case SFF8636_ETHERNET_100G_LR4:
- printf("%s 100G Ethernet: 100G Base-LR4\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G Base-LR4");
break;
case SFF8636_ETHERNET_100G_ER4:
- printf("%s 100G Ethernet: 100G Base-ER4\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G Base-ER4");
break;
case SFF8636_ETHERNET_100G_SR10:
- printf("%s 100G Ethernet: 100G Base-SR10\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G Base-SR10");
break;
case SFF8636_ETHERNET_100G_CWDM4_FEC:
- printf("%s 100G Ethernet: 100G CWDM4 MSA with FEC\n", pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G CWDM4 MSA with FEC");
break;
case SFF8636_ETHERNET_100G_PSM4:
- printf("%s 100G Ethernet: 100G PSM4 Parallel SMF\n", pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G PSM4 Parallel SMF");
break;
case SFF8636_ETHERNET_100G_ACC:
- printf("%s 100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)");
break;
case SFF8636_ETHERNET_100G_CWDM4_NO_FEC:
- printf("%s 100G Ethernet: 100G CWDM4 MSA without FEC\n", pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G CWDM4 MSA without FEC");
break;
case SFF8636_ETHERNET_100G_RSVD1:
- printf("%s (reserved or unknown)\n", pfx);
+ sprintf(value, "%s", "(reserved or unknown)");
break;
case SFF8636_ETHERNET_100G_CR4:
- printf("%s 100G Ethernet: 100G Base-CR4 or 25G Base-CR CA-L\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G Base-CR4 or 25G Base-CR CA-L");
break;
case SFF8636_ETHERNET_25G_CR_CA_S:
- printf("%s 25G Ethernet: 25G Base-CR CA-S\n", pfx);
+ sprintf(value, "%s", "25G Ethernet: 25G Base-CR CA-S");
break;
case SFF8636_ETHERNET_25G_CR_CA_N:
- printf("%s 25G Ethernet: 25G Base-CR CA-N\n", pfx);
+ sprintf(value, "%s", "25G Ethernet: 25G Base-CR CA-N");
break;
case SFF8636_ETHERNET_40G_ER4:
- printf("%s 40G Ethernet: 40G Base-ER4\n", pfx);
+ sprintf(value, "%s", "40G Ethernet: 40G Base-ER4");
break;
case SFF8636_ETHERNET_4X10_SR:
- printf("%s 4x10G Ethernet: 10G Base-SR\n", pfx);
+ sprintf(value, "%s", "4x10G Ethernet: 10G Base-SR");
break;
case SFF8636_ETHERNET_40G_PSM4:
- printf("%s 40G Ethernet: 40G PSM4 Parallel SMF\n", pfx);
+ sprintf(value, "%s",
+ "40G Ethernet: 40G PSM4 Parallel SMF");
break;
case SFF8636_ETHERNET_G959_P1I1_2D1:
- printf("%s Ethernet: G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm SM)\n",
- pfx);
+ sprintf(value, "%s",
+ "Ethernet: G959.1 profile P1I1-2D1 (10709 MBd, 2km, 1310nm SM)");
break;
case SFF8636_ETHERNET_G959_P1S1_2D2:
- printf("%s Ethernet: G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm SM)\n",
- pfx);
+ sprintf(value, "%s",
+ "Ethernet: G959.1 profile P1S1-2D2 (10709 MBd, 40km, 1550nm SM)");
break;
case SFF8636_ETHERNET_G959_P1L1_2D2:
- printf("%s Ethernet: G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm SM)\n",
- pfx);
+ sprintf(value, "%s",
+ "Ethernet: G959.1 profile P1L1-2D2 (10709 MBd, 80km, 1550nm SM)");
break;
case SFF8636_ETHERNET_10GT_SFI:
- printf("%s 10G Ethernet: 10G Base-T with SFI electrical interface\n",
- pfx);
+ sprintf(value, "%s",
+ "10G Ethernet: 10G Base-T with SFI electrical interface");
break;
case SFF8636_ETHERNET_100G_CLR4:
- printf("%s 100G Ethernet: 100G CLR4\n", pfx);
+ sprintf(value, "%s", "100G Ethernet: 100G CLR4");
break;
case SFF8636_ETHERNET_100G_AOC2:
- printf("%s 100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)");
break;
case SFF8636_ETHERNET_100G_ACC2:
- printf("%s 100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)\n",
- pfx);
+ sprintf(value, "%s",
+ "100G Ethernet: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)");
break;
case SFF8636_ETHERNET_100GE_DWDM2:
- printf("%s 100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)\n",
- pfx);
+ sprintf(value, "%s",
+ "100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)");
break;
case SFF8636_ETHERNET_100G_1550NM_WDM:
- printf("%s 100G 1550nm WDM (4 wavelengths)\n", pfx);
+ sprintf(value, "%s", "100G 1550nm WDM (4 wavelengths)");
break;
case SFF8636_ETHERNET_10G_BASET_SR:
- printf("%s 10GBASE-T Short Reach (30 meters)\n", pfx);
+ sprintf(value, "%s",
+ "10GBASE-T Short Reach (30 meters)");
break;
case SFF8636_ETHERNET_5G_BASET:
- printf("%s 5GBASE-T\n", pfx);
+ sprintf(value, "%s", "5GBASE-T");
break;
case SFF8636_ETHERNET_2HALFG_BASET:
- printf("%s 2.5GBASE-T\n", pfx);
+ sprintf(value, "%s", "2.5GBASE-T");
break;
case SFF8636_ETHERNET_40G_SWDM4:
- printf("%s 40G SWDM4\n", pfx);
+ sprintf(value, "%s", "40G SWDM4");
break;
case SFF8636_ETHERNET_100G_SWDM4:
- printf("%s 100G SWDM4\n", pfx);
+ sprintf(value, "%s", "100G SWDM4");
break;
case SFF8636_ETHERNET_100G_PAM4_BIDI:
- printf("%s 100G PAM4 BiDi\n", pfx);
+ sprintf(value, "%s", "100G PAM4 BiDi");
break;
case SFF8636_ETHERNET_4WDM10_MSA:
- printf("%s 4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)");
break;
case SFF8636_ETHERNET_4WDM20_MSA:
- printf("%s 4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s", "4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)");
break;
case SFF8636_ETHERNET_4WDM40_MSA:
- printf("%s 4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)");
break;
case SFF8636_ETHERNET_100G_DR:
- printf("%s 100GBASE-DR (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "100GBASE-DR (clause 140), CAUI-4 (no FEC)");
break;
case SFF8636_ETHERNET_100G_FR_NOFEC:
- printf("%s 100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)");
break;
case SFF8636_ETHERNET_100G_LR_NOFEC:
- printf("%s 100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)");
break;
case SFF8636_ETHERNET_200G_ACC1:
- printf("%s Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
break;
case SFF8636_ETHERNET_200G_AOC1:
- printf("%s Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
break;
case SFF8636_ETHERNET_200G_ACC2:
- printf("%s Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below");
break;
case SFF8636_ETHERNET_200G_A0C2:
- printf("%s Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below");
break;
case SFF8636_ETHERNET_200G_CR4:
- printf("%s 50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4\n", pfx);
+ sprintf(value, "%s",
+ "50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4");
break;
case SFF8636_ETHERNET_200G_SR4:
- printf("%s 50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4\n", pfx);
+ sprintf(value, "%s",
+ "50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4");
break;
case SFF8636_ETHERNET_200G_DR4:
- printf("%s 50GBASE-FR or 200GBASE-DR4\n", pfx);
+ sprintf(value, "%s", "50GBASE-FR or 200GBASE-DR4");
break;
case SFF8636_ETHERNET_200G_FR4:
- printf("%s 200GBASE-FR4\n", pfx);
+ sprintf(value, "%s", "200GBASE-FR4");
break;
case SFF8636_ETHERNET_200G_PSM4:
- printf("%s 200G 1550 nm PSM4\n", pfx);
+ sprintf(value, "%s", "200G 1550 nm PSM4");
break;
case SFF8636_ETHERNET_50G_LR:
- printf("%s 50GBASE-LR\n", pfx);
+ sprintf(value, "%s", "50GBASE-LR");
break;
case SFF8636_ETHERNET_200G_LR4:
- printf("%s 200GBASE-LR4\n", pfx);
+ sprintf(value, "%s", "200GBASE-LR4");
break;
case SFF8636_ETHERNET_64G_EA:
- printf("%s 64GFC EA\n", pfx);
+ sprintf(value, "%s", "64GFC EA");
break;
case SFF8636_ETHERNET_64G_SW:
- printf("%s 64GFC SW\n", pfx);
+ sprintf(value, "%s", "64GFC SW");
break;
case SFF8636_ETHERNET_64G_LW:
- printf("%s 64GFC LW\n", pfx);
+ sprintf(value, "%s", "64GFC LW");
break;
case SFF8636_ETHERNET_128FC_EA:
- printf("%s 128GFC EA\n", pfx);
+ sprintf(value, "%s", "128GFC EA");
break;
case SFF8636_ETHERNET_128FC_SW:
- printf("%s 128GFC SW\n", pfx);
+ sprintf(value, "%s", "128GFC SW");
break;
case SFF8636_ETHERNET_128FC_LW:
- printf("%s 128GFC LW\n", pfx);
+ sprintf(value, "%s", "128GFC LW");
break;
default:
- printf("%s (reserved or unknown)\n", pfx);
+ sprintf(value, "%s", "(reserved or unknown)");
break;
}
}
@@ -382,96 +440,98 @@ static void sff8636_show_transceiver(const struct sff8636_memory_map *map)
/* SONET Compliance Codes */
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] &
(SFF8636_SONET_40G_OTN))
- printf("%s 40G OTN (OTU3B/OTU3C)\n", pfx);
+ sprintf(value, "%s", "40G OTN (OTU3B/OTU3C)");
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] & (SFF8636_SONET_OC48_LR))
- printf("%s SONET: OC-48, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, long reach");
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] & (SFF8636_SONET_OC48_IR))
- printf("%s SONET: OC-48, intermediate reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, intermediate reach");
if (map->page_00h[SFF8636_SONET_COMP_OFFSET] & (SFF8636_SONET_OC48_SR))
- printf("%s SONET: OC-48, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, short reach");
/* SAS/SATA Compliance Codes */
if (map->page_00h[SFF8636_SAS_COMP_OFFSET] & (SFF8636_SAS_6G))
- printf("%s SAS 6.0G\n", pfx);
+ sprintf(value, "%s", "SAS 6.0G");
if (map->page_00h[SFF8636_SAS_COMP_OFFSET] & (SFF8636_SAS_3G))
- printf("%s SAS 3.0G\n", pfx);
+ sprintf(value, "%s", "SAS 3.0G");
/* Ethernet Compliance Codes */
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_T)
- printf("%s Ethernet: 1000BASE-T\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-T");
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_CX)
- printf("%s Ethernet: 1000BASE-CX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-CX");
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_LX)
- printf("%s Ethernet: 1000BASE-LX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-LX");
if (map->page_00h[SFF8636_GIGE_COMP_OFFSET] & SFF8636_GIGE_1000_BASE_SX)
- printf("%s Ethernet: 1000BASE-SX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-SX");
/* Fibre Channel link length */
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_VERY_LONG)
- printf("%s FC: very long distance (V)\n", pfx);
+ sprintf(value, "%s", "FC: very long distance (V)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_SHORT)
- printf("%s FC: short distance (S)\n", pfx);
+ sprintf(value, "%s", "FC: short distance (S)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_INT)
- printf("%s FC: intermediate distance (I)\n", pfx);
+ sprintf(value, "%s", "FC: intermediate distance (I)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_LONG)
- printf("%s FC: long distance (L)\n", pfx);
+ sprintf(value, "%s", "FC: long distance (L)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_LEN_MED)
- printf("%s FC: medium distance (M)\n", pfx);
+ sprintf(value, "%s", "FC: medium distance (M)");
/* Fibre Channel transmitter technology */
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_TECH_LONG_LC)
- printf("%s FC: Longwave laser (LC)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LC)");
if (map->page_00h[SFF8636_FC_LEN_OFFSET] & SFF8636_FC_TECH_ELEC_INTER)
- printf("%s FC: Electrical inter-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical inter-enclosure (EL)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] & SFF8636_FC_TECH_ELEC_INTRA)
- printf("%s FC: Electrical intra-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical intra-enclosure (EL)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] &
SFF8636_FC_TECH_SHORT_WO_OFC)
- printf("%s FC: Shortwave laser w/o OFC (SN)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser w/o OFC (SN)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] & SFF8636_FC_TECH_SHORT_W_OFC)
- printf("%s FC: Shortwave laser with OFC (SL)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser with OFC (SL)");
if (map->page_00h[SFF8636_FC_TECH_OFFSET] & SFF8636_FC_TECH_LONG_LL)
- printf("%s FC: Longwave laser (LL)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LL)");
/* Fibre Channel transmission media */
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_TW)
- printf("%s FC: Twin Axial Pair (TW)\n", pfx);
+ sprintf(value, "%s", "FC: Twin Axial Pair (TW)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_TP)
- printf("%s FC: Twisted Pair (TP)\n", pfx);
+ sprintf(value, "%s", "FC: Twisted Pair (TP)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_MI)
- printf("%s FC: Miniature Coax (MI)\n", pfx);
+ sprintf(value, "%s", "FC: Miniature Coax (MI)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_TV)
- printf("%s FC: Video Coax (TV)\n", pfx);
+ sprintf(value, "%s", "FC: Video Coax (TV)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_M6)
- printf("%s FC: Multimode, 62.5m (M6)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 62.5m (M6)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_M5)
- printf("%s FC: Multimode, 50m (M5)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 50m (M5)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_OM3)
- printf("%s FC: Multimode, 50um (OM3)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 50um (OM3)");
if (map->page_00h[SFF8636_FC_TRANS_MEDIA_OFFSET] &
SFF8636_FC_TRANS_MEDIA_SM)
- printf("%s FC: Single Mode (SM)\n", pfx);
+ sprintf(value, "%s", "FC: Single Mode (SM)");
/* Fibre Channel speed */
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_1200_MBPS)
- printf("%s FC: 1200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 1200 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_800_MBPS)
- printf("%s FC: 800 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 800 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_1600_MBPS)
- printf("%s FC: 1600 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 1600 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_400_MBPS)
- printf("%s FC: 400 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 400 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_200_MBPS)
- printf("%s FC: 200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 200 MBytes/sec");
if (map->page_00h[SFF8636_FC_SPEED_OFFSET] & SFF8636_FC_SPEED_100_MBPS)
- printf("%s FC: 100 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 100 MBytes/sec");
+
+ module_print_any_string(pfx, value);
}
static void sff8636_show_encoding(const struct sff8636_memory_map *map)
@@ -483,8 +543,10 @@ static void sff8636_show_encoding(const struct sff8636_memory_map *map)
static void sff8636_show_rate_identifier(const struct sff8636_memory_map *map)
{
/* TODO: Need to fix rate select logic */
- printf("\t%-41s : 0x%02x\n", "Rate identifier",
- map->page_00h[SFF8636_EXT_RS_OFFSET]);
+ sff_print_any_hex_field("Rate identifier", "rate_identifier",
+ map->page_00h[SFF8636_EXT_RS_OFFSET], NULL);
+
+
}
static void
@@ -496,58 +558,65 @@ sff8636_show_wavelength_or_copper_compliance(const struct sff8636_memory_map *ma
module_show_mit_compliance(value);
if (value >= SFF8636_TRANS_COPPER_PAS_UNEQUAL) {
- printf("\t%-41s : %udb\n", "Attenuation at 2.5GHz",
- map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET]);
- printf("\t%-41s : %udb\n", "Attenuation at 5.0GHz",
- map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET]);
- printf("\t%-41s : %udb\n", "Attenuation at 7.0GHz",
- map->page_00h[SFF8636_WAVE_TOL_HIGH_BYTE_OFFSET]);
- printf("\t%-41s : %udb\n", "Attenuation at 12.9GHz",
- map->page_00h[SFF8636_WAVE_TOL_LOW_BYTE_OFFSET]);
+ module_print_any_uint("Attenuation at 2.5GHz",
+ map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET],
+ "db");
+ module_print_any_uint("Attenuation at 5.0GHz",
+ map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET],
+ "db");
+ module_print_any_uint("Attenuation at 7.0GHz",
+ map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET],
+ "db");
+ module_print_any_uint("Attenuation at 12.9GHz",
+ map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET],
+ "db");
} else {
- printf("\t%-41s : %.3lfnm\n", "Laser wavelength",
- (((map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET] << 8) |
- map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET]) * 0.05));
- printf("\t%-41s : %.3lfnm\n", "Laser wavelength tolerance",
- (((map->page_00h[SFF8636_WAVE_TOL_HIGH_BYTE_OFFSET] << 8) |
- map->page_00h[SFF8636_WAVE_TOL_LOW_BYTE_OFFSET]) * 0.005));
+ module_print_any_float("Laser wavelength",
+ (((map->page_00h[SFF8636_WAVELEN_HIGH_BYTE_OFFSET] << 8) |
+ map->page_00h[SFF8636_WAVELEN_LOW_BYTE_OFFSET]) * 0.05),
+ "nm");
+ module_print_any_float("Laser wavelength tolerance",
+ (((map->page_00h[SFF8636_WAVE_TOL_HIGH_BYTE_OFFSET] << 8) |
+ map->page_00h[SFF8636_WAVE_TOL_LOW_BYTE_OFFSET]) * 0.05),
+ "nm");
}
}
static void sff8636_show_revision_compliance(const __u8 *id, int rev_offset)
{
- static const char *pfx =
- "\tRevision Compliance :";
+ const char *pfx = "Revision Compliance";
+ char value[64] = "";
switch (id[rev_offset]) {
case SFF8636_REV_UNSPECIFIED:
- printf("%s Revision not specified\n", pfx);
+ sprintf(value, "%s", "Revision not specified");
break;
case SFF8636_REV_8436_48:
- printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
+ sprintf(value, "%s", "SFF-8436 Rev 4.8 or earlier");
break;
case SFF8636_REV_8436_8636:
- printf("%s SFF-8436 Rev 4.8 or earlier\n", pfx);
+ sprintf(value, "%s", "SFF-8436 Rev 4.8 or earlier");
break;
case SFF8636_REV_8636_13:
- printf("%s SFF-8636 Rev 1.3 or earlier\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 1.3 or earlier");
break;
case SFF8636_REV_8636_14:
- printf("%s SFF-8636 Rev 1.4\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 1.4");
break;
case SFF8636_REV_8636_15:
- printf("%s SFF-8636 Rev 1.5\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 1.5");
break;
case SFF8636_REV_8636_20:
- printf("%s SFF-8636 Rev 2.0\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 2.0");
break;
case SFF8636_REV_8636_27:
- printf("%s SFF-8636 Rev 2.5/2.6/2.7\n", pfx);
+ sprintf(value, "%s", "SFF-8636 Rev 2.5/2.6/2.7");
break;
default:
- printf("%s Unallocated\n", pfx);
+ sprintf(value, "%s", "Unallocated");
break;
}
+ module_print_any_string(pfx, value);
}
/*
@@ -654,11 +723,21 @@ static void sff8636_show_dom_chan_lvl_tx_bias(const struct sff_diags *sd)
char power_string[MAX_DESC_SIZE];
int i;
+ open_json_array("laser_tx_bias_current", "");
for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- "Laser tx bias current", i+1);
- PRINT_BIAS(power_string, sd->scd[i].bias_cur);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.3f",
+ (double)sd->scd[i].bias_cur / 500.);
+ } else {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ "Laser tx bias current", i+1);
+ PRINT_BIAS(power_string, sd->scd[i].bias_cur);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units("laser_tx_bias_current", "mA");
}
static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags *sd)
@@ -666,11 +745,21 @@ static void sff8636_show_dom_chan_lvl_tx_power(const struct sff_diags *sd)
char power_string[MAX_DESC_SIZE];
int i;
+ open_json_array("transmit_avg_optical_power", "");
for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- "Transmit avg optical power", i+1);
- PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.4f",
+ (double)sd->scd[i].tx_power / 10000.);
+ } else {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ "Transmit avg optical power", i+1);
+ PRINT_xX_PWR(power_string, sd->scd[i].tx_power);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units("transmit_avg_optical_power", "mW");
}
static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags *sd)
@@ -684,11 +773,25 @@ static void sff8636_show_dom_chan_lvl_rx_power(const struct sff_diags *sd)
else
rx_power_string = "Rcvr signal avg optical power";
+ char rx_power_json_str[strlen(rx_power_string)];
+
+ convert_json_field_name(rx_power_string, rx_power_json_str);
+
+ open_json_array(rx_power_json_str, "");
for (i = 0; i < SFF8636_MAX_CHANNEL_NUM; i++) {
- snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
- rx_power_string, i+1);
- PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
+ if (is_json_context()) {
+ print_float(PRINT_JSON, NULL, "%.4f",
+ (double)sd->scd[i].rx_power / 10000.);
+ } else {
+ snprintf(power_string, MAX_DESC_SIZE, "%s (Channel %d)",
+ rx_power_string, i+1);
+ PRINT_xX_PWR(power_string, sd->scd[i].rx_power);
+ }
}
+ close_json_array("");
+
+ if (is_json_context())
+ module_print_any_units(rx_power_json_str, "mW");
}
static void
@@ -698,38 +801,61 @@ sff8636_show_dom_chan_lvl_flags(const struct sff8636_memory_map *map)
int i;
for (i = 0; module_aw_chan_flags[i].fmt_str; ++i) {
+ char json_str[80] = {};
+ char str[80] = {};
int j = 1;
if (module_aw_chan_flags[i].type != MODULE_TYPE_SFF8636)
continue;
+ convert_json_field_name(module_aw_chan_flags[i].fmt_str,
+ json_str);
+
+ open_json_array(json_str, "");
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,
- ONOFF(value));
+ if (is_json_context()) {
+ print_bool(PRINT_JSON, NULL, NULL, value);
+ } else {
+ snprintf(str, 80, "%s (Chan %d)",
+ module_aw_chan_flags[i].fmt_str, j);
+ printf("\t%-41s : %s\n", str, ONOFF(value));
+ }
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);
+ } 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--;
+ close_json_array("");
}
}
static void
sff8636_show_dom_mod_lvl_flags(const struct sff8636_memory_map *map)
{
+ bool value;
int i;
for (i = 0; module_aw_mod_flags[i].str; ++i) {
- if (module_aw_mod_flags[i].type == MODULE_TYPE_SFF8636)
+ char str[80] = {};
+
+ if (module_aw_mod_flags[i].type != MODULE_TYPE_SFF8636)
+ continue;
+
+ value = map->lower_memory[module_aw_mod_flags[i].offset] &
+ module_aw_mod_flags[i].value;
+
+ if (is_json_context()) {
+ print_bool(PRINT_JSON, module_aw_mod_flags[i].str,
+ NULL, value);
+ } else {
+ snprintf(str, 80, "%s (Chan %d)",
+ module_aw_mod_flags[i].str, i+1);
printf("\t%-41s : %s\n",
- module_aw_mod_flags[i].str,
- ONOFF(map->lower_memory[module_aw_mod_flags[i].offset]
- & module_aw_mod_flags[i].value));
+ module_aw_mod_flags[i].str, ONOFF(value));
+ }
}
}
@@ -765,8 +891,9 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
(sd.sfp_temp[MCURR] == (__s16)0xFFFF))
return;
- printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
- (sd.supports_alarms ? "Yes" : "No"));
+ module_print_any_bool("Alarm/warning flags implemented",
+ "alarm/warning_flags_implemented",
+ sd.supports_alarms, YESNO(sd.supports_alarms));
sff8636_show_dom_chan_lvl_tx_bias(&sd);
sff8636_show_dom_chan_lvl_tx_power(&sd);
@@ -776,7 +903,10 @@ static void sff8636_show_dom(const struct sff8636_memory_map *map)
sff8636_show_dom_chan_lvl_flags(map);
sff8636_show_dom_mod_lvl_flags(map);
- sff_show_thresholds(sd);
+ if (is_json_context())
+ sff_show_thresholds_json(sd);
+ else
+ sff_show_thresholds(sd);
}
}
@@ -817,7 +947,7 @@ static void sff8636_show_page_zero(const struct sff8636_memory_map *map)
sff8636_show_transceiver(map);
sff8636_show_encoding(map);
module_show_value_with_unit(map->page_00h, SFF8636_BR_NOMINAL_OFFSET,
- "BR, Nominal", 100, "Mbps");
+ "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");
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-26 11:56 ` [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules Danielle Ratson
@ 2025-01-27 20:16 ` Jakub Kicinski
2025-01-28 13:23 ` Danielle Ratson
0 siblings, 1 reply; 39+ messages in thread
From: Jakub Kicinski @ 2025-01-27 20:16 UTC (permalink / raw)
To: Danielle Ratson; +Cc: netdev, mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw
On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
> + open_json_object("extended_identifier");
> + print_int(PRINT_JSON, "value", "0x%02x",
> + map->page_00h[SFF8636_EXT_ID_OFFSET]);
Hm, why hex here?
Priority for JSON output is to make it easy to handle in code,
rather than easy to read. Hex strings need extra manual decoding, no?
BTW thanks for pushing this work forward!
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-27 20:16 ` Jakub Kicinski
@ 2025-01-28 13:23 ` Danielle Ratson
2025-01-28 22:13 ` Jakub Kicinski
2025-01-29 10:44 ` Petr Machata
0 siblings, 2 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-28 13:23 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Monday, 27 January 2025 22:16
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <nbu-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --
> module-info in SFF8636 modules
>
> On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
> > + open_json_object("extended_identifier");
> > + print_int(PRINT_JSON, "value", "0x%02x",
> > + map->page_00h[SFF8636_EXT_ID_OFFSET]);
>
> Hm, why hex here?
> Priority for JSON output is to make it easy to handle in code, rather than easy
> to read. Hex strings need extra manual decoding, no?
I kept the same convention as in the regular output.
And as agreed in Daniel's design those hex fields remain hex fields and are followed by a description field.
Do you think otherwise?
>
> BTW thanks for pushing this work forward!
Thanks!
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-28 13:23 ` Danielle Ratson
@ 2025-01-28 22:13 ` Jakub Kicinski
2025-01-29 11:37 ` Gal Pressman
2025-01-29 12:50 ` Danielle Ratson
2025-01-29 10:44 ` Petr Machata
1 sibling, 2 replies; 39+ messages in thread
From: Jakub Kicinski @ 2025-01-28 22:13 UTC (permalink / raw)
To: Danielle Ratson
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
On Tue, 28 Jan 2025 13:23:42 +0000 Danielle Ratson wrote:
> > On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
> > > + open_json_object("extended_identifier");
> > > + print_int(PRINT_JSON, "value", "0x%02x",
> > > + map->page_00h[SFF8636_EXT_ID_OFFSET]);
> >
> > Hm, why hex here?
> > Priority for JSON output is to make it easy to handle in code, rather than easy
> > to read. Hex strings need extra manual decoding, no?
>
> I kept the same convention as in the regular output.
> And as agreed in Daniel's design those hex fields remain hex fields
> and are followed by a description field.
>
> Do you think otherwise?
I have a weak preference to never use hex strings.
I have regretted using hex strings in JSON multiple times but haven't
regretted using plain integers, yet.
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-28 22:13 ` Jakub Kicinski
@ 2025-01-29 11:37 ` Gal Pressman
2025-01-29 11:53 ` Danielle Ratson
2025-01-29 16:21 ` Petr Machata
2025-01-29 12:50 ` Danielle Ratson
1 sibling, 2 replies; 39+ messages in thread
From: Gal Pressman @ 2025-01-29 11:37 UTC (permalink / raw)
To: Jakub Kicinski, Danielle Ratson
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
On 29/01/2025 0:13, Jakub Kicinski wrote:
> On Tue, 28 Jan 2025 13:23:42 +0000 Danielle Ratson wrote:
>>> On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
>>>> + open_json_object("extended_identifier");
>>>> + print_int(PRINT_JSON, "value", "0x%02x",
>>>> + map->page_00h[SFF8636_EXT_ID_OFFSET]);
>>>
>>> Hm, why hex here?
>>> Priority for JSON output is to make it easy to handle in code, rather than easy
>>> to read. Hex strings need extra manual decoding, no?
>>
>> I kept the same convention as in the regular output.
>> And as agreed in Daniel's design those hex fields remain hex fields
>> and are followed by a description field.
>>
>> Do you think otherwise?
>
> I have a weak preference to never use hex strings.
> I have regretted using hex strings in JSON multiple times but haven't
> regretted using plain integers, yet.
>
+1, jq won't be able to parse such json.
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-29 11:37 ` Gal Pressman
@ 2025-01-29 11:53 ` Danielle Ratson
2025-01-29 16:21 ` Petr Machata
1 sibling, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-29 11:53 UTC (permalink / raw)
To: Gal Pressman, Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> From: Gal Pressman <gal@nvidia.com>
> Sent: Wednesday, 29 January 2025 13:37
> To: Jakub Kicinski <kuba@kernel.org>; Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <NBU-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --
> module-info in SFF8636 modules
>
> On 29/01/2025 0:13, Jakub Kicinski wrote:
> > On Tue, 28 Jan 2025 13:23:42 +0000 Danielle Ratson wrote:
> >>> On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
> >>>> + open_json_object("extended_identifier");
> >>>> + print_int(PRINT_JSON, "value", "0x%02x",
> >>>> + map->page_00h[SFF8636_EXT_ID_OFFSET]);
> >>>
> >>> Hm, why hex here?
> >>> Priority for JSON output is to make it easy to handle in code,
> >>> rather than easy to read. Hex strings need extra manual decoding, no?
> >>
> >> I kept the same convention as in the regular output.
> >> And as agreed in Daniel's design those hex fields remain hex fields
> >> and are followed by a description field.
> >>
> >> Do you think otherwise?
> >
> > I have a weak preference to never use hex strings.
> > I have regretted using hex strings in JSON multiple times but haven't
> > regretted using plain integers, yet.
> >
>
> +1, jq won't be able to parse such json.
Ok.
^ permalink raw reply [flat|nested] 39+ messages in thread* Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-29 11:37 ` Gal Pressman
2025-01-29 11:53 ` Danielle Ratson
@ 2025-01-29 16:21 ` Petr Machata
1 sibling, 0 replies; 39+ messages in thread
From: Petr Machata @ 2025-01-29 16:21 UTC (permalink / raw)
To: Gal Pressman
Cc: Jakub Kicinski, Danielle Ratson, netdev@vger.kernel.org,
mkubecek@suse.cz, matt@traverse.com.au, daniel.zahka@gmail.com,
Amit Cohen, NBU-mlxsw
Gal Pressman <gal@nvidia.com> writes:
> On 29/01/2025 0:13, Jakub Kicinski wrote:
>> On Tue, 28 Jan 2025 13:23:42 +0000 Danielle Ratson wrote:
>>>> On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
>>>>> + open_json_object("extended_identifier");
>>>>> + print_int(PRINT_JSON, "value", "0x%02x",
>>>>> + map->page_00h[SFF8636_EXT_ID_OFFSET]);
>>>>
>>>> Hm, why hex here?
>>>> Priority for JSON output is to make it easy to handle in code, rather than easy
>>>> to read. Hex strings need extra manual decoding, no?
>>>
>>> I kept the same convention as in the regular output.
>>> And as agreed in Daniel's design those hex fields remain hex fields
>>> and are followed by a description field.
>>>
>>> Do you think otherwise?
>>
>> I have a weak preference to never use hex strings.
>> I have regretted using hex strings in JSON multiple times but haven't
>> regretted using plain integers, yet.
>>
>
> +1, jq won't be able to parse such json.
Curious that tonumber doesn't have a way to make it work though :-/
^ permalink raw reply [flat|nested] 39+ messages in thread
* RE: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-28 22:13 ` Jakub Kicinski
2025-01-29 11:37 ` Gal Pressman
@ 2025-01-29 12:50 ` Danielle Ratson
1 sibling, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-29 12:50 UTC (permalink / raw)
To: Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> -----Original Message-----
> From: Jakub Kicinski <kuba@kernel.org>
> Sent: Wednesday, 29 January 2025 0:14
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: netdev@vger.kernel.org; mkubecek@suse.cz; matt@traverse.com.au;
> daniel.zahka@gmail.com; Amit Cohen <amcohen@nvidia.com>; NBU-mlxsw
> <NBU-mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --
> module-info in SFF8636 modules
>
> On Tue, 28 Jan 2025 13:23:42 +0000 Danielle Ratson wrote:
> > > On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
> > > > + open_json_object("extended_identifier");
> > > > + print_int(PRINT_JSON, "value", "0x%02x",
> > > > + map->page_00h[SFF8636_EXT_ID_OFFSET]);
> > >
> > > Hm, why hex here?
> > > Priority for JSON output is to make it easy to handle in code,
> > > rather than easy to read. Hex strings need extra manual decoding, no?
> >
> > I kept the same convention as in the regular output.
> > And as agreed in Daniel's design those hex fields remain hex fields
> > and are followed by a description field.
> >
> > Do you think otherwise?
>
> I have a weak preference to never use hex strings.
> I have regretted using hex strings in JSON multiple times but haven't regretted
> using plain integers, yet.
Ok.
^ permalink raw reply [flat|nested] 39+ messages in thread
* Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-28 13:23 ` Danielle Ratson
2025-01-28 22:13 ` Jakub Kicinski
@ 2025-01-29 10:44 ` Petr Machata
2025-01-29 11:53 ` Danielle Ratson
1 sibling, 1 reply; 39+ messages in thread
From: Petr Machata @ 2025-01-29 10:44 UTC (permalink / raw)
To: Danielle Ratson
Cc: Jakub Kicinski, netdev@vger.kernel.org, mkubecek@suse.cz,
matt@traverse.com.au, daniel.zahka@gmail.com, Amit Cohen,
NBU-mlxsw
Danielle Ratson <danieller@nvidia.com> writes:
> From: Jakub Kicinski <kuba@kernel.org>
>>
>> On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
>> > + open_json_object("extended_identifier");
>> > + print_int(PRINT_JSON, "value", "0x%02x",
>> > + map->page_00h[SFF8636_EXT_ID_OFFSET]);
>>
>> Hm, why hex here?
>> Priority for JSON output is to make it easy to handle in code, rather than easy
>> to read. Hex strings need extra manual decoding, no?
>
> I kept the same convention as in the regular output.
>
> And as agreed in Daniel's design those hex fields remain hex fields and are followed by a description field.
>
> Do you think otherwise?
Regular output is for human consumption, JSON is for machine
consumption. IMHO it makes sense to reasonably diverge and use the
"correct" JSON type where available, even if the human-readable output
is different. So numbers should IMHO be numbers, true / false, yes / no,
off / on etc. should probably be booleans, arrays should be arrays, etc.
^ permalink raw reply [flat|nested] 39+ messages in thread* RE: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules
2025-01-29 10:44 ` Petr Machata
@ 2025-01-29 11:53 ` Danielle Ratson
0 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-29 11:53 UTC (permalink / raw)
To: Petr Machata, Jakub Kicinski
Cc: netdev@vger.kernel.org, mkubecek@suse.cz, matt@traverse.com.au,
daniel.zahka@gmail.com, Amit Cohen, NBU-mlxsw
> -----Original Message-----
> From: Petr Machata <petrm@nvidia.com>
> Sent: Wednesday, 29 January 2025 12:44
> To: Danielle Ratson <danieller@nvidia.com>
> Cc: Jakub Kicinski <kuba@kernel.org>; netdev@vger.kernel.org;
> mkubecek@suse.cz; matt@traverse.com.au; daniel.zahka@gmail.com; Amit
> Cohen <amcohen@nvidia.com>; NBU-mlxsw <NBU-
> mlxsw@exchange.nvidia.com>
> Subject: Re: [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --
> module-info in SFF8636 modules
>
>
> Danielle Ratson <danieller@nvidia.com> writes:
>
> > From: Jakub Kicinski <kuba@kernel.org>
> >>
> >> On Sun, 26 Jan 2025 13:56:30 +0200 Danielle Ratson wrote:
> >> > + open_json_object("extended_identifier");
> >> > + print_int(PRINT_JSON, "value", "0x%02x",
> >> > + map->page_00h[SFF8636_EXT_ID_OFFSET]);
> >>
> >> Hm, why hex here?
> >> Priority for JSON output is to make it easy to handle in code, rather
> >> than easy to read. Hex strings need extra manual decoding, no?
> >
> > I kept the same convention as in the regular output.
> >
> > And as agreed in Daniel's design those hex fields remain hex fields and are
> followed by a description field.
> >
> > Do you think otherwise?
>
> Regular output is for human consumption, JSON is for machine consumption.
> IMHO it makes sense to reasonably diverge and use the "correct" JSON type
> where available, even if the human-readable output is different. So numbers
> should IMHO be numbers, true / false, yes / no, off / on etc. should probably
> be booleans, arrays should be arrays, etc.
Ok, for both of you, will use ints instead of in JSON output.
^ permalink raw reply [flat|nested] 39+ messages in thread
* [PATCH ethtool-next 10/14] qsfp: Enable JSON output support for SFF8636 modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (8 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 09/14] qsfp: Add JSON output handling to --module-info in SFF8636 modules Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 11/14] sfpid: Add JSON output handling to --module-info in SFF8079 modules Danielle Ratson
` (3 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
A sample output:
$ ethtool --json -m swp13
[ {
"identifier": 17,
"identifier_description": "QSFP28",
"extended_identifier": {
"value": 207,
"description": "3.5W max. Power consumption",
"description": "CDR present in TX, CDR present in RX",
"description": "5.0W max. Power consumption, High Power
Class (> 3.5 W) enabled"
},
"power_set": false,
"power_override": true,
"connector": 35,
"connector_description": "No separable connector",
"transceiver_codes": [ 128,0,0,0,0,0,0,0 ],
"transceiver_type": "Active Optical Cable with 50GAUI, 100GAUI-2
or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below",
"encoding": 8,
"encoding_description": "PAM4",
"br_nominal": 25500,
"br_nominal_units": "Mbps",
"rate_identifier": 2,
"length_(smf,km)": 0,
"length_(smf,km)_units": "km",
"length_(om3_50um)": 0,
"length_(om3_50um)_units": "m",
"length_(om2_50um)": 0,
"length_(om2_50um)_units": "m",
"length_(om1_62.5um)": 0,
"length_(om1_62.5um)_units": "m",
"length_(copper_or_active_cable)": 3,
"length_(copper_or_active_cable)_units": "m",
"transmitter_technology": 0,
"transmitter_technology_description": "850 nm VCSEL",
"laser_wavelength": 850,
"laser_wavelength_units": "nm",
"laser_wavelength_tolerance": 150,
"laser_wavelength_tolerance_units": "nm",
"vendor_name": "Mellanox",
"vendor_oui": [ 0,2,201 ],
"vendor_pn": "MFS1S00-V003E",
"vendor_rev": "A6",
"vendor_sn": "MT1915FT03913",
"date_code": "190412",
"revision_compliance": "Unallocated",
"rx_loss_of_signal": [ "Yes","Yes","Yes","Yes" ],
"tx_loss_of_signal": "None",
"rx_loss_of_lock": [ "Yes","Yes","Yes","Yes" ],
"tx_loss_of_lock": "None",
"tx_adaptive_eq_fault": "None",
"module_temperature": 56.75,
"module_temperature_units": "degrees C",
"module_voltage": 3.261,
"module_voltage_units": "V",
"alarm/warning_flags_implemented": true,
"laser_tx_bias_current": [ 0,0,0,0 ],
"laser_tx_bias_current_units": "mA",
"transmit_avg_optical_power": [ 0,0,0,0 ],
"transmit_avg_optical_power_units": "mW",
"rcvr_signal_avg_optical_power": [ 0.0388,0.041,0.0417,0.0392 ],
"rcvr_signal_avg_optical_power_units": "mW",
"laser_bias_current_high_alarm": [ false,false,false,false ],
"laser_bias_current_low_alarm": [ false,false,false,false ],
"laser_bias_current_high_warning": [ false,false,false,false ],
"laser_bias_current_low_warning": [ false,false,false,false ],
"laser_tx_power_high_alarm": [ false,false,false,false ],
"laser_tx_power_low_alarm": [ false,false,false,false ],
"laser_tx_power_high_warning": [ false,false,false,false ],
"laser_tx_power_low_warning": [ false,false,false,false ],
"laser_rx_power_high_alarm": [ false,false,false,false ],
"laser_rx_power_low_alarm": [ true,true,true,true ],
"laser_rx_power_high_warning": [ false,false,false,false ],
"laser_rx_power_low_warning": [ true,true,true,true ],
"Module temperature high alarm": false,
"Module temperature low alarm": false,
"Module temperature high warning": false,
"Module temperature low warning": false,
"Module voltage high alarm": false,
"Module voltage low alarm": false,
"Module voltage high warning": false,
"Module voltage low warning": false,
"laser_bias_current": {
"high_alarm_threshold": 8.5,
"low_alarm_threshold": 5.492,
"high_warning_threshold": 8,
"low_warning_threshold": 6,
"units": "mA"
},
"laser_output_power": {
"high_alarm_threshold": 3.4673,
"low_alarm_threshold": 0.0724,
"high_warning_threshold": 1.7378,
"low_warning_threshold": 0.1445,
"units": "mW"
},
"module_temperature": {
"high_alarm_threshold": 80,
"low_alarm_threshold": -10,
"high_warning_threshold": 70,
"low_warning_threshold": 0,
"units": "degrees C"
},
"module_voltage": {
"high_alarm_threshold": 3.5,
"low_alarm_threshold": 3.1,
"high_warning_threshold": 3.465,
"low_warning_threshold": 3.135,
"units": "V"
},
"laser_rx_power": {
"high_alarm_threshold": 3.4673,
"low_alarm_threshold": 0.0467,
"high_warning_threshold": 1.7378,
"low_warning_threshold": 0.0933,
"units": "mW"
}
} ]
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
qsfp.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/qsfp.c b/qsfp.c
index d835067..6f95377 100644
--- a/qsfp.c
+++ b/qsfp.c
@@ -1096,10 +1096,16 @@ int sff8636_show_all_nl(struct cmd_context *ctx)
struct sff8636_memory_map map = {};
int ret;
+ new_json_obj(ctx->json);
+ open_json_object(NULL);
+
ret = sff8636_memory_map_init_pages(ctx, &map);
if (ret < 0)
return ret;
sff8636_show_all_common(&map);
+ close_json_object();
+ delete_json_obj();
+
return 0;
}
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 11/14] sfpid: Add JSON output handling to --module-info in SFF8079 modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (9 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 10/14] qsfp: Enable JSON output support for " Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 12/14] sfpdiag: Add JSON output handling to --module-info in SFF8472 modules Danielle Ratson
` (2 subsequent siblings)
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Add JSON output handling for 'ethtool -m' / --module-info, following the
guideline below:
1. Fields with description, will have a separate description field.
2. Fields with units, will have a separate unit field.
3. ASCII fields will be presented as strings.
4. On/Off is rendered as true/false.
5. Yes/no is rendered as true/false.
6. Per-channel fields will be presented as array, when each element
represents a channel.
7. Fields that hold version, will be split to major and minor sub fields.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
sfpid.c | 360 ++++++++++++++++++++++++++++++++------------------------
1 file changed, 207 insertions(+), 153 deletions(-)
diff --git a/sfpid.c b/sfpid.c
index 3c126b4..f97e2b3 100644
--- a/sfpid.c
+++ b/sfpid.c
@@ -42,231 +42,258 @@ static void sff8079_show_connector(const __u8 *id)
static void sff8079_show_transceiver(const __u8 *id)
{
- static const char *pfx =
- "\tTransceiver type :";
+ static const char *pfx = "Transceiver type";
+ char value[140] = "";
- printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
- "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
- "Transceiver codes",
- id[3], id[4], id[5], id[6],
- id[7], id[8], id[9], id[10], id[36]);
+ if (is_json_context()) {
+ open_json_array("transceiver_codes", "");
+ print_int(PRINT_JSON, NULL, "0x%02x", id[3]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[4]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[5]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[6]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[7]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[8]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[9]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[10]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[36]);
+ close_json_array("");
+ } else {
+ printf("\t%-41s : 0x%02x 0x%02x 0x%02x " \
+ "0x%02x 0x%02x 0x%02x 0x%02x 0x%02x 0x%02x\n",
+ "Transceiver codes", id[3], id[4], id[5], id[6],
+ id[7], id[8], id[9], id[10], id[36]);
+ }
/* 10G Ethernet Compliance Codes */
if (id[3] & (1 << 7))
- printf("%s 10G Ethernet: 10G Base-ER" \
- " [SFF-8472 rev10.4 onwards]\n", pfx);
+ sprintf(value, "%s",
+ "10G Ethernet: 10G Base-LRM [SFF-8472 rev10.4 onwards]");
if (id[3] & (1 << 6))
- printf("%s 10G Ethernet: 10G Base-LRM\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LRM");
if (id[3] & (1 << 5))
- printf("%s 10G Ethernet: 10G Base-LR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-LR");
if (id[3] & (1 << 4))
- printf("%s 10G Ethernet: 10G Base-SR\n", pfx);
+ sprintf(value, "%s", "10G Ethernet: 10G Base-SR");
/* Infiniband Compliance Codes */
if (id[3] & (1 << 3))
- printf("%s Infiniband: 1X SX\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X SX");
if (id[3] & (1 << 2))
- printf("%s Infiniband: 1X LX\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X LX");
if (id[3] & (1 << 1))
- printf("%s Infiniband: 1X Copper Active\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X Copper Active");
if (id[3] & (1 << 0))
- printf("%s Infiniband: 1X Copper Passive\n", pfx);
+ sprintf(value, "%s", "Infiniband: 1X Copper Passive");
/* ESCON Compliance Codes */
if (id[4] & (1 << 7))
- printf("%s ESCON: ESCON MMF, 1310nm LED\n", pfx);
+ sprintf(value, "%s", "ESCON: ESCON MMF, 1310nm LED");
if (id[4] & (1 << 6))
- printf("%s ESCON: ESCON SMF, 1310nm Laser\n", pfx);
+ sprintf(value, "%s", "ESCON: ESCON SMF, 1310nm Laser");
/* SONET Compliance Codes */
if (id[4] & (1 << 5))
- printf("%s SONET: OC-192, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-192, short reach");
if (id[4] & (1 << 4))
- printf("%s SONET: SONET reach specifier bit 1\n", pfx);
+ sprintf(value, "%s", "SONET: SONET reach specifier bit 1");
if (id[4] & (1 << 3))
- printf("%s SONET: SONET reach specifier bit 2\n", pfx);
+ sprintf(value, "%s", "SONET: SONET reach specifier bit 2");
if (id[4] & (1 << 2))
- printf("%s SONET: OC-48, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, long reach");
if (id[4] & (1 << 1))
- printf("%s SONET: OC-48, intermediate reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, intermediate reach");
if (id[4] & (1 << 0))
- printf("%s SONET: OC-48, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-48, short reach");
if (id[5] & (1 << 6))
- printf("%s SONET: OC-12, single mode, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-12, single mode, long reach");
if (id[5] & (1 << 5))
- printf("%s SONET: OC-12, single mode, inter. reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-12, single mode, inter. reach");
if (id[5] & (1 << 4))
- printf("%s SONET: OC-12, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-12, short reach");
if (id[5] & (1 << 2))
- printf("%s SONET: OC-3, single mode, long reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-3, single mode, long reach");
if (id[5] & (1 << 1))
- printf("%s SONET: OC-3, single mode, inter. reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-3, single mode, inter. reach");
if (id[5] & (1 << 0))
- printf("%s SONET: OC-3, short reach\n", pfx);
+ sprintf(value, "%s", "SONET: OC-3, short reach");
/* Ethernet Compliance Codes */
if (id[6] & (1 << 7))
- printf("%s Ethernet: BASE-PX\n", pfx);
+ sprintf(value, "%s", "Ethernet: BASE-PX");
if (id[6] & (1 << 6))
- printf("%s Ethernet: BASE-BX10\n", pfx);
+ sprintf(value, "%s", "Ethernet: BASE-BX10");
if (id[6] & (1 << 5))
- printf("%s Ethernet: 100BASE-FX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 100BASE-FX");
if (id[6] & (1 << 4))
- printf("%s Ethernet: 100BASE-LX/LX10\n", pfx);
+ sprintf(value, "%s", "Ethernet: 100BASE-LX/LX10");
if (id[6] & (1 << 3))
- printf("%s Ethernet: 1000BASE-T\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-T");
if (id[6] & (1 << 2))
- printf("%s Ethernet: 1000BASE-CX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-CX");
if (id[6] & (1 << 1))
- printf("%s Ethernet: 1000BASE-LX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-LX");
if (id[6] & (1 << 0))
- printf("%s Ethernet: 1000BASE-SX\n", pfx);
+ sprintf(value, "%s", "Ethernet: 1000BASE-SX");
/* Fibre Channel link length */
if (id[7] & (1 << 7))
- printf("%s FC: very long distance (V)\n", pfx);
+ sprintf(value, "%s", "FC: very long distance (V)");
if (id[7] & (1 << 6))
- printf("%s FC: short distance (S)\n", pfx);
+ sprintf(value, "%s", "FC: short distance (S)");
if (id[7] & (1 << 5))
- printf("%s FC: intermediate distance (I)\n", pfx);
+ sprintf(value, "%s", "FC: intermediate distance (I)");
if (id[7] & (1 << 4))
- printf("%s FC: long distance (L)\n", pfx);
+ sprintf(value, "%s", "FC: long distance (L)");
if (id[7] & (1 << 3))
- printf("%s FC: medium distance (M)\n", pfx);
+ sprintf(value, "%s", "FC: medium distance (M)");
/* Fibre Channel transmitter technology */
if (id[7] & (1 << 2))
- printf("%s FC: Shortwave laser, linear Rx (SA)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser, linear Rx (SA)");
if (id[7] & (1 << 1))
- printf("%s FC: Longwave laser (LC)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LC)");
if (id[7] & (1 << 0))
- printf("%s FC: Electrical inter-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical inter-enclosure (EL)");
if (id[8] & (1 << 7))
- printf("%s FC: Electrical intra-enclosure (EL)\n", pfx);
+ sprintf(value, "%s", "FC: Electrical intra-enclosure (EL)");
if (id[8] & (1 << 6))
- printf("%s FC: Shortwave laser w/o OFC (SN)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser w/o OFC (SN)");
if (id[8] & (1 << 5))
- printf("%s FC: Shortwave laser with OFC (SL)\n", pfx);
+ sprintf(value, "%s", "FC: Shortwave laser with OFC (SL)");
if (id[8] & (1 << 4))
- printf("%s FC: Longwave laser (LL)\n", pfx);
+ sprintf(value, "%s", "FC: Longwave laser (LL)");
if (id[8] & (1 << 3))
- printf("%s Active Cable\n", pfx);
+ sprintf(value, "%s", "Active Cable");
if (id[8] & (1 << 2))
- printf("%s Passive Cable\n", pfx);
+ sprintf(value, "%s", "Passive Cable");
if (id[8] & (1 << 1))
- printf("%s FC: Copper FC-BaseT\n", pfx);
+ sprintf(value, "%s", "FC: Copper FC-BaseT");
/* Fibre Channel transmission media */
if (id[9] & (1 << 7))
- printf("%s FC: Twin Axial Pair (TW)\n", pfx);
+ sprintf(value, "%s", "FC: Twin Axial Pair (TW)");
if (id[9] & (1 << 6))
- printf("%s FC: Twisted Pair (TP)\n", pfx);
+ sprintf(value, "%s", "FC: Twisted Pair (TP)");
if (id[9] & (1 << 5))
- printf("%s FC: Miniature Coax (MI)\n", pfx);
+ sprintf(value, "%s", "FC: Miniature Coax (MI)");
if (id[9] & (1 << 4))
- printf("%s FC: Video Coax (TV)\n", pfx);
+ sprintf(value, "%s", "FC: Video Coax (TV)");
if (id[9] & (1 << 3))
- printf("%s FC: Multimode, 62.5um (M6)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 62.5um (M6)");
if (id[9] & (1 << 2))
- printf("%s FC: Multimode, 50um (M5)\n", pfx);
+ sprintf(value, "%s", "FC: Multimode, 50um (M5)");
if (id[9] & (1 << 0))
- printf("%s FC: Single Mode (SM)\n", pfx);
+ sprintf(value, "%s", "FC: Single Mode (SM)");
/* Fibre Channel speed */
if (id[10] & (1 << 7))
- printf("%s FC: 1200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 1200 MBytes/sec");
if (id[10] & (1 << 6))
- printf("%s FC: 800 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 800 MBytes/sec");
if (id[10] & (1 << 4))
- printf("%s FC: 400 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 400 MBytes/sec");
if (id[10] & (1 << 2))
- printf("%s FC: 200 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 200 MBytes/sec");
if (id[10] & (1 << 0))
- printf("%s FC: 100 MBytes/sec\n", pfx);
+ sprintf(value, "%s", "FC: 100 MBytes/sec");
/* Extended Specification Compliance Codes from SFF-8024 */
if (id[36] == 0x1)
- printf("%s Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 5x10^(-5)");
if (id[36] == 0x2)
- printf("%s Extended: 100G Base-SR4 or 25GBase-SR\n", pfx);
+ sprintf(value, "%s", "Extended: 100G Base-SR4 or 25GBase-SR");
if (id[36] == 0x3)
- printf("%s Extended: 100G Base-LR4 or 25GBase-LR\n", pfx);
+ sprintf(value, "%s", "Extended: 100G Base-LR4 or 25GBase-LR");
if (id[36] == 0x4)
- printf("%s Extended: 100G Base-ER4 or 25GBase-ER\n", pfx);
+ sprintf(value, "%s", "Extended: 100G Base-ER4 or 25GBase-ER");
if (id[36] == 0x8)
- printf("%s Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 5x10^(-5)");
if (id[36] == 0xb)
- printf("%s Extended: 100G Base-CR4 or 25G Base-CR CA-L\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G Base-CR4 or 25G Base-CR CA-L");
if (id[36] == 0xc)
- printf("%s Extended: 25G Base-CR CA-S\n", pfx);
+ sprintf(value, "%s", "Extended: 25G Base-CR CA-S");
if (id[36] == 0xd)
- printf("%s Extended: 25G Base-CR CA-N\n", pfx);
+ sprintf(value, "%s", "Extended: 25G Base-CR CA-N");
if (id[36] == 0x16)
- printf("%s Extended: 10Gbase-T with SFI electrical interface\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 10Gbase-T with SFI electrical interface");
if (id[36] == 0x18)
- printf("%s Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G AOC or 25GAUI C2M AOC with worst BER of 10^(-12)");
if (id[36] == 0x19)
- printf("%s Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G ACC or 25GAUI C2M ACC with worst BER of 10^(-12)");
if (id[36] == 0x1a)
- printf("%s Extended: 100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 100GE-DWDM2 (DWDM transceiver using 2 wavelengths on a 1550 nm DWDM grid with a reach up to 80 km)");
if (id[36] == 0x1b)
- printf("%s Extended: 100G 1550nm WDM (4 wavelengths)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G 1550nm WDM (4 wavelengths)");
if (id[36] == 0x1c)
- printf("%s Extended: 10Gbase-T Short Reach\n", pfx);
+ sprintf(value, "%s", "Extended: 10Gbase-T Short Reach");
if (id[36] == 0x1d)
- printf("%s Extended: 5GBASE-T\n", pfx);
+ sprintf(value, "%s", "Extended: 5GBASE-T");
if (id[36] == 0x1e)
- printf("%s Extended: 2.5GBASE-T\n", pfx);
+ sprintf(value, "%s", "Extended: 2.5GBASE-T");
if (id[36] == 0x1f)
- printf("%s Extended: 40G SWDM4\n", pfx);
+ sprintf(value, "%s", "Extended: 40G SWDM4");
if (id[36] == 0x20)
- printf("%s Extended: 100G SWDM4\n", pfx);
+ sprintf(value, "%s", "Extended: 100G SWDM4");
if (id[36] == 0x21)
- printf("%s Extended: 100G PAM4 BiDi\n", pfx);
+ sprintf(value, "%s", "Extended: 100G PAM4 BiDi");
if (id[36] == 0x22)
- printf("%s Extended: 4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 4WDM-10 MSA (10km version of 100G CWDM4 with same RS(528,514) FEC in host system)");
if (id[36] == 0x23)
- printf("%s Extended: 4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 4WDM-20 MSA (20km version of 100GBASE-LR4 with RS(528,514) FEC in host system)");
if (id[36] == 0x24)
- printf("%s Extended: 4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: 4WDM-40 MSA (40km reach with APD receiver and RS(528,514) FEC in host system)");
if (id[36] == 0x25)
- printf("%s Extended: 100GBASE-DR (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100GBASE-DR (clause 140), CAUI-4 (no FEC)");
if (id[36] == 0x26)
- printf("%s Extended: 100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G-FR or 100GBASE-FR1 (clause 140), CAUI-4 (no FEC)");
if (id[36] == 0x27)
- printf("%s Extended: 100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 100G-LR or 100GBASE-LR1 (clause 140), CAUI-4 (no FEC)");
if (id[36] == 0x30)
- printf("%s Extended: Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
if (id[36] == 0x31)
- printf("%s Extended: Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below");
if (id[36] == 0x32)
- printf("%s Extended: Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: Active Copper Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below");
if (id[36] == 0x33)
- printf("%s Extended: Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below\n",
- pfx);
+ sprintf(value, "%s",
+ "Extended: Active Optical Cable with 50GAUI, 100GAUI-2 or 200GAUI-4 C2M. Providing a worst BER of 2.6x10-4 for ACC, 10-5 for AUI, or below");
if (id[36] == 0x40)
- printf("%s Extended: 50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 50GBASE-CR, 100GBASE-CR2, or 200GBASE-CR4");
if (id[36] == 0x41)
- printf("%s Extended: 50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4\n", pfx);
+ sprintf(value, "%s",
+ "Extended: 50GBASE-SR, 100GBASE-SR2, or 200GBASE-SR4");
if (id[36] == 0x42)
- printf("%s Extended: 50GBASE-FR or 200GBASE-DR4\n", pfx);
+ sprintf(value, "%s", "Extended: 50GBASE-FR or 200GBASE-DR4");
if (id[36] == 0x43)
- printf("%s Extended: 200GBASE-FR4\n", pfx);
+ sprintf(value, "%s", "Extended: 200GBASE-FR4");
if (id[36] == 0x44)
- printf("%s Extended: 200G 1550 nm PSM4\n", pfx);
+ sprintf(value, "%s", "Extended: 200G 1550 nm PSM4");
if (id[36] == 0x45)
- printf("%s Extended: 50GBASE-LR\n", pfx);
+ sprintf(value, "%s", "Extended: 50GBASE-LR");
if (id[36] == 0x46)
- printf("%s Extended: 200GBASE-LR4\n", pfx);
+ sprintf(value, "%s", "Extended: 200GBASE-LR4");
if (id[36] == 0x50)
- printf("%s Extended: 64GFC EA\n", pfx);
+ sprintf(value, "%s", "Extended: 64GFC EA");
if (id[36] == 0x51)
- printf("%s Extended: 64GFC SW\n", pfx);
+ sprintf(value, "%s", "Extended: 64GFC SW");
if (id[36] == 0x52)
- printf("%s Extended: 64GFC LW\n", pfx);
+ sprintf(value, "%s", "Extended: 64GFC LW");
if (id[36] == 0x53)
- printf("%s Extended: 128GFC EA\n", pfx);
+ sprintf(value, "%s", "Extended: 128GFC EA");
if (id[36] == 0x54)
- printf("%s Extended: 128GFC SW\n", pfx);
+ sprintf(value, "%s", "Extended: 128GFC SW");
if (id[36] == 0x55)
- printf("%s Extended: 128GFC LW\n", pfx);
+ sprintf(value, "%s", "Extended: 128GFC LW");
+
+ module_print_any_string(pfx, value);
}
static void sff8079_show_encoding(const __u8 *id)
@@ -276,100 +303,127 @@ static void sff8079_show_encoding(const __u8 *id)
static void sff8079_show_rate_identifier(const __u8 *id)
{
- printf("\t%-41s : 0x%02x", "Rate identifier", id[13]);
+ char description[SFF_MAX_DESC_LEN];
+
switch (id[13]) {
case 0x00:
- printf(" (unspecified)\n");
+ sprintf(description, "%s", "unspecified");
break;
case 0x01:
- printf(" (4/2/1G Rate_Select & AS0/AS1)\n");
+ sprintf(description, "%s", "4/2/1G Rate_Select & AS0/AS1");
break;
case 0x02:
- printf(" (8/4/2G Rx Rate_Select only)\n");
+ sprintf(description, "%s", "8/4/2G Rx Rate_Select only");
break;
case 0x03:
- printf(" (8/4/2G Independent Rx & Tx Rate_Select)\n");
+ sprintf(description, "%s",
+ "8/4/2G Independent Rx & Tx Rate_Select");
break;
case 0x04:
- printf(" (8/4/2G Tx Rate_Select only)\n");
+ sprintf(description, "%s", "8/4/2G Tx Rate_Select only");
break;
default:
- printf(" (reserved or unknown)\n");
+ sprintf(description, "%s", "reserved or unknown");
break;
}
+
+ sff_print_any_hex_field("Rate identifier", "rate_identifier", id[13],
+ description);
}
static void sff8079_show_wavelength_or_copper_compliance(const __u8 *id)
{
+ char description[SFF_MAX_DESC_LEN];
+
if (id[8] & (1 << 2)) {
- printf("\t%-41s : 0x%02x", "Passive Cu cmplnce.", id[60]);
switch (id[60]) {
case 0x00:
- printf(" (unspecified)");
+ strncpy(description, "unspecified",
+ SFF_MAX_DESC_LEN);
break;
case 0x01:
- printf(" (SFF-8431 appendix E)");
+ strncpy(description, "SFF-8431 appendix E",
+ SFF_MAX_DESC_LEN);
break;
default:
- printf(" (unknown)");
+ strncpy(description, "unknown", SFF_MAX_DESC_LEN);
break;
}
- printf(" [SFF-8472 rev10.4 only]\n");
+ strcat(description, " [SFF-8472 rev10.4 only]");
+ sff_print_any_hex_field("Passive Cu cmplnce.",
+ "passive_cu_cmplnce.",
+ id[60], description);
} else if (id[8] & (1 << 3)) {
printf("\t%-41s : 0x%02x", "Active Cu cmplnce.", id[60]);
switch (id[60]) {
case 0x00:
- printf(" (unspecified)");
+ strncpy(description, "unspecified",
+ SFF_MAX_DESC_LEN);
break;
case 0x01:
- printf(" (SFF-8431 appendix E)");
+ strncpy(description, "SFF-8431 appendix E",
+ SFF_MAX_DESC_LEN);
break;
case 0x04:
- printf(" (SFF-8431 limiting)");
+ strncpy(description, "SFF-8431 limiting",
+ SFF_MAX_DESC_LEN);
break;
default:
- printf(" (unknown)");
+ strncpy(description, "unknown", SFF_MAX_DESC_LEN);
break;
}
- printf(" [SFF-8472 rev10.4 only]\n");
+ strcat(description, " [SFF-8472 rev10.4 only]");
+ sff_print_any_hex_field("Active Cu cmplnce.",
+ "active_cu_cmplnce.",
+ id[60], description);
} else {
- printf("\t%-41s : %unm\n", "Laser wavelength",
- (id[60] << 8) | id[61]);
+ module_print_any_uint("Laser wavelength",
+ (id[60] << 8) | id[61], "nm");
}
}
static void sff8079_show_options(const __u8 *id)
{
- static const char *pfx =
- "\tOption :";
+ static const char *pfx = "Option";
+ char value[64] = "";
- printf("\t%-41s : 0x%02x 0x%02x\n", "Option values", id[64], id[65]);
+ if (is_json_context()) {
+ open_json_array("option_values", "");
+ print_int(PRINT_JSON, NULL, "0x%02x", id[64]);
+ print_int(PRINT_JSON, NULL, "0x%02x", id[65]);
+ close_json_array("");
+ } else {
+ printf("\t%-41s : 0x%02x 0x%02x\n", "Option values", id[64],
+ id[65]);
+ }
if (id[65] & (1 << 1))
- printf("%s RX_LOS implemented\n", pfx);
+ sprintf(value, "%s", "RX_LOS implemented");
if (id[65] & (1 << 2))
- printf("%s RX_LOS implemented, inverted\n", pfx);
+ sprintf(value, "%s", "RX_LOS implemented, inverted");
if (id[65] & (1 << 3))
- printf("%s TX_FAULT implemented\n", pfx);
+ sprintf(value, "%s", "TX_FAULT implemented");
if (id[65] & (1 << 4))
- printf("%s TX_DISABLE implemented\n", pfx);
+ sprintf(value, "%s", "TX_DISABLE implemented");
if (id[65] & (1 << 5))
- printf("%s RATE_SELECT implemented\n", pfx);
+ sprintf(value, "%s", "RATE_SELECT implemented");
if (id[65] & (1 << 6))
- printf("%s Tunable transmitter technology\n", pfx);
+ sprintf(value, "%s", "Tunable transmitter technology");
if (id[65] & (1 << 7))
- printf("%s Receiver decision threshold implemented\n", pfx);
+ sprintf(value, "%s", "Receiver decision threshold implemented");
if (id[64] & (1 << 0))
- printf("%s Linear receiver output implemented\n", pfx);
+ sprintf(value, "%s", "Linear receiver output implemented");
if (id[64] & (1 << 1))
- printf("%s Power level 2 requirement\n", pfx);
+ sprintf(value, "%s", "Power level 2 requirement");
if (id[64] & (1 << 2))
- printf("%s Cooled transceiver implemented\n", pfx);
+ sprintf(value, "%s", "Cooled transceiver implemented");
if (id[64] & (1 << 3))
- printf("%s Retimer or CDR implemented\n", pfx);
+ sprintf(value, "%s", "Retimer or CDR implemented");
if (id[64] & (1 << 4))
- printf("%s Paging implemented\n", pfx);
+ sprintf(value, "%s", "Paging implemented");
if (id[64] & (1 << 5))
- printf("%s Power level 3 requirement\n", pfx);
+ sprintf(value, "%s", "Power level 3 requirement");
+
+ module_print_any_string(pfx, value);
}
static void sff8079_show_all_common(const __u8 *id)
@@ -393,7 +447,7 @@ static void sff8079_show_all_common(const __u8 *id)
sff8079_show_connector(id);
sff8079_show_transceiver(id);
sff8079_show_encoding(id);
- printf("\t%-41s : %u%s\n", "BR, Nominal", br_nom, "MBd");
+ module_print_any_uint("BR Nominal", br_nom, "MBd");
sff8079_show_rate_identifier(id);
module_show_value_with_unit(id, 14,
"Length (SMF,km)", 1, "km");
@@ -409,8 +463,8 @@ static void sff8079_show_all_common(const __u8 *id)
module_show_ascii(id, 40, 55, "Vendor PN");
module_show_ascii(id, 56, 59, "Vendor rev");
sff8079_show_options(id);
- printf("\t%-41s : %u%s\n", "BR margin, max", br_max, "%");
- printf("\t%-41s : %u%s\n", "BR margin, min", br_min, "%");
+ module_print_any_uint("BR margin max", br_max, "%");
+ module_print_any_uint("BR margin min", br_min, "%");
module_show_ascii(id, 68, 83, "Vendor SN");
module_show_ascii(id, 84, 91, "Date code");
}
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 12/14] sfpdiag: Add JSON output handling to --module-info in SFF8472 modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (10 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 11/14] sfpid: Add JSON output handling to --module-info in SFF8079 modules Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 13/14] ethtool: Enable JSON output support for SFF8079 and " Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 14/14] ethtool: Add '-j' support to ethtool Danielle Ratson
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Add JSON output handling for 'ethtool -m' / --module-info, following
the guideline below:
1. Fields with description, will have a separate description field.
2. Fields with units, will have a separate unit field.
3. ASCII fields will be presented as strings.
4. On/Off is rendered as true/false.
5. Yes/no is rendered as true/false.
6. Per-channel fields will be presented as array, when each element
represents a channel.
7. Fields that hold version, will be split to major and minor sub fields.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
sfpdiag.c | 42 +++++++++++++++++++++++++++++-------------
1 file changed, 29 insertions(+), 13 deletions(-)
diff --git a/sfpdiag.c b/sfpdiag.c
index bbca91e..4b40bc8 100644
--- a/sfpdiag.c
+++ b/sfpdiag.c
@@ -247,34 +247,50 @@ void sff8472_show_all(const __u8 *id)
sff8472_parse_eeprom(id, &sd);
- if (!sd.supports_dom) {
- printf("\t%-41s : No\n", "Optical diagnostics support");
+ module_print_any_bool("Optical diagnostics support",
+ "optical_diagnostics_support",
+ sd.supports_dom, YESNO(sd.supports_dom));
+
+ if (!sd.supports_dom)
return;
- }
- printf("\t%-41s : Yes\n", "Optical diagnostics support");
- PRINT_BIAS("Laser bias current", sd.bias_cur[MCURR]);
- PRINT_xX_PWR("Laser output power", sd.tx_power[MCURR]);
+ PRINT_BIAS_ALL("Laser bias current", "laser_bias_current",
+ sd.bias_cur[MCURR]);
+ PRINT_xX_PWR_ALL("Laser output power", "laser_output_power",
+ sd.tx_power[MCURR]);
if (!sd.rx_power_type)
rx_power_string = "Receiver signal OMA";
else
rx_power_string = "Receiver signal average optical power";
- PRINT_xX_PWR(rx_power_string, sd.rx_power[MCURR]);
+ char rx_power_json_str[strlen(rx_power_string)];
+
+ convert_json_field_name(rx_power_string, rx_power_json_str);
+
+ PRINT_xX_PWR_ALL(rx_power_string, rx_power_json_str,
+ sd.rx_power[MCURR]);
module_show_dom_mod_lvl_monitors(&sd);
- printf("\t%-41s : %s\n", "Alarm/warning flags implemented",
- (sd.supports_alarms ? "Yes" : "No"));
+ module_print_any_bool("Alarm/warning flags implemented",
+ "alarm/warning_flags_implemented",
+ sd.supports_alarms, YESNO(sd.supports_alarms));
+
if (sd.supports_alarms) {
for (i = 0; sff8472_aw_flags[i].str; ++i) {
- printf("\t%-41s : %s\n", sff8472_aw_flags[i].str,
- id[SFF_A2_BASE + sff8472_aw_flags[i].offset]
- & sff8472_aw_flags[i].value ? "On" : "Off");
+ bool value;
+
+ value = id[SFF_A2_BASE + sff8472_aw_flags[i].offset] &
+ sff8472_aw_flags[i].value;
+ module_print_any_bool(sff8472_aw_flags[i].str, NULL,
+ value, ONOFF(value));
}
- sff_show_thresholds(sd);
+ if (is_json_context())
+ sff_show_thresholds_json(sd);
+ else
+ sff_show_thresholds(sd);
}
}
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 13/14] ethtool: Enable JSON output support for SFF8079 and SFF8472 modules
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (11 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 12/14] sfpdiag: Add JSON output handling to --module-info in SFF8472 modules Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
2025-01-26 11:56 ` [PATCH ethtool-next 14/14] ethtool: Add '-j' support to ethtool Danielle Ratson
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
A sample output:
$ ethtool --json -m swp13
[ {
"identifier": 17,
"identifier_description": "QSFP28",
"extended_identifier": {
"value": 207,
"description": "3.5W max. Power consumption",
"description": "CDR present in TX, CDR present in RX",
"description": "5.0W max. Power consumption, High Power
Class (> 3.5 W) enabled"
},
"power_set": false,
"power_override": true,
"connector": 35,
"connector_description": "No separable connector",
"transceiver_codes": [ 128,0,0,0,0,0,0,0 ],
"transceiver_type": "Active Optical Cable with 50GAUI, 100GAUI-2
or 200GAUI-4 C2M. Providing a worst BER of 10-6 or below",
"encoding": 8,
"encoding_description": "PAM4",
"br_nominal": 25500,
"br_nominal_units": "Mbps",
"rate_identifier": 2,
"length_(smf,km)": 0,
"length_(smf,km)_units": "km",
"length_(om3_50um)": 0,
"length_(om3_50um)_units": "m",
"length_(om2_50um)": 0,
"length_(om2_50um)_units": "m",
"length_(om1_62.5um)": 0,
"length_(om1_62.5um)_units": "m",
"length_(copper_or_active_cable)": 3,
"length_(copper_or_active_cable)_units": "m",
"transmitter_technology": 0,
"transmitter_technology_description": "850 nm VCSEL",
"laser_wavelength": 850,
"laser_wavelength_units": "nm",
"laser_wavelength_tolerance": 150,
"laser_wavelength_tolerance_units": "nm",
"vendor_name": "Mellanox",
"vendor_oui": [ 0,2,201 ],
"vendor_pn": "MFS1S00-V003E",
"vendor_rev": "A6",
"vendor_sn": "MT1915FT03913",
"date_code": "190412",
"revision_compliance": "Unallocated",
"rx_loss_of_signal": [ "Yes","Yes","Yes","Yes" ],
"tx_loss_of_signal": "None",
"rx_loss_of_lock": [ "Yes","Yes","Yes","Yes" ],
"tx_loss_of_lock": "None",
"tx_adaptive_eq_fault": "None",
"module_temperature": 56.75,
"module_temperature_units": "degrees C",
"module_voltage": 3.261,
"module_voltage_units": "V",
"alarm/warning_flags_implemented": true,
"laser_tx_bias_current": [ 0,0,0,0 ],
"laser_tx_bias_current_units": "mA",
"transmit_avg_optical_power": [ 0,0,0,0 ],
"transmit_avg_optical_power_units": "mW",
"rcvr_signal_avg_optical_power": [ 0.0388,0.041,0.0417,0.0392 ],
"rcvr_signal_avg_optical_power_units": "mW",
"laser_bias_current_high_alarm": [ false,false,false,false ],
"laser_bias_current_low_alarm": [ false,false,false,false ],
"laser_bias_current_high_warning": [ false,false,false,false ],
"laser_bias_current_low_warning": [ false,false,false,false ],
"laser_tx_power_high_alarm": [ false,false,false,false ],
"laser_tx_power_low_alarm": [ false,false,false,false ],
"laser_tx_power_high_warning": [ false,false,false,false ],
"laser_tx_power_low_warning": [ false,false,false,false ],
"laser_rx_power_high_alarm": [ false,false,false,false ],
"laser_rx_power_low_alarm": [ true,true,true,true ],
"laser_rx_power_high_warning": [ false,false,false,false ],
"laser_rx_power_low_warning": [ true,true,true,true ],
"Module temperature high alarm": false,
"Module temperature low alarm": false,
"Module temperature high warning": false,
"Module temperature low warning": false,
"Module voltage high alarm": false,
"Module voltage low alarm": false,
"Module voltage high warning": false,
"Module voltage low warning": false,
"laser_bias_current": {
"high_alarm_threshold": 8.5,
"low_alarm_threshold": 5.492,
"high_warning_threshold": 8,
"low_warning_threshold": 6,
"units": "mA"
},
"laser_output_power": {
"high_alarm_threshold": 3.4673,
"low_alarm_threshold": 0.0724,
"high_warning_threshold": 1.7378,
"low_warning_threshold": 0.1445,
"units": "mW"
},
"module_temperature": {
"high_alarm_threshold": 80,
"low_alarm_threshold": -10,
"high_warning_threshold": 70,
"low_warning_threshold": 0,
"units": "degrees C"
},
"module_voltage": {
"high_alarm_threshold": 3.5,
"low_alarm_threshold": 3.1,
"high_warning_threshold": 3.465,
"low_warning_threshold": 3.135,
"units": "V"
},
"laser_rx_power": {
"high_alarm_threshold": 3.4673,
"low_alarm_threshold": 0.0467,
"high_warning_threshold": 1.7378,
"low_warning_threshold": 0.0933,
"units": "mW"
}
} ]
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
ethtool.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/ethtool.c b/ethtool.c
index 2818206..51c9a46 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -5002,6 +5002,8 @@ static int do_getmodule(struct cmd_context *ctx)
(eeprom->len != modinfo.eeprom_len)) {
geeprom_dump_hex = 1;
} else if (!geeprom_dump_hex) {
+ new_json_obj(ctx->json);
+ open_json_object(NULL);
switch (modinfo.type) {
#ifdef ETHTOOL_ENABLE_PRETTY_DUMP
case ETH_MODULE_SFF_8079:
@@ -5021,6 +5023,8 @@ static int do_getmodule(struct cmd_context *ctx)
geeprom_dump_hex = 1;
break;
}
+ close_json_object();
+ delete_json_obj();
}
if (geeprom_dump_hex)
dump_hex(stdout, eeprom->data,
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread* [PATCH ethtool-next 14/14] ethtool: Add '-j' support to ethtool
2025-01-26 11:56 [PATCH ethtool-next 00/14] Add JSON output to --module-info Danielle Ratson
` (12 preceding siblings ...)
2025-01-26 11:56 ` [PATCH ethtool-next 13/14] ethtool: Enable JSON output support for SFF8079 and " Danielle Ratson
@ 2025-01-26 11:56 ` Danielle Ratson
13 siblings, 0 replies; 39+ messages in thread
From: Danielle Ratson @ 2025-01-26 11:56 UTC (permalink / raw)
To: netdev; +Cc: mkubecek, matt, daniel.zahka, amcohen, nbu-mlxsw, Danielle Ratson
Currently, only '--json' flag is supported for JSON output in the
ethtool commands.
Add support for the shorter '-j' flag also.
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
ethtool.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/ethtool.c b/ethtool.c
index 51c9a46..ae17d49 100644
--- a/ethtool.c
+++ b/ethtool.c
@@ -6283,7 +6283,7 @@ static int show_usage(struct cmd_context *ctx __maybe_unused)
fprintf(stdout, "\n");
fprintf(stdout, "FLAGS:\n");
fprintf(stdout, " --debug MASK turn on debugging messages\n");
- fprintf(stdout, " --json enable JSON output format (not supported by all commands)\n");
+ fprintf(stdout, " -j|--json enable JSON output format (not supported by all commands)\n");
fprintf(stdout, " -I|--include-statistics request device statistics related to the command (not supported by all commands)\n");
return 0;
@@ -6539,7 +6539,8 @@ int main(int argc, char **argp)
argc -= 2;
continue;
}
- if (*argp && !strcmp(*argp, "--json")) {
+ if (*argp && (!strcmp(*argp, "--json") ||
+ !strcmp(*argp, "-j"))) {
ctx.json = true;
argp += 1;
argc -= 1;
--
2.47.0
^ permalink raw reply related [flat|nested] 39+ messages in thread