RE: [PATCH ethtool-next v2 1/2] sfpid: print all implemented options

-----Original Message-----
From: Aleksander Jan Bajkowski <redacted>
Sent: Saturday, 11 July 2026 12:54
To: Danielle Ratson <redacted>; mkubecek@suse.cz;
andrew@lunn.ch; davem@davemloft.net; edumazet@google.com;
kuba@kernel.org; pabeni@redhat.com; jbe@pengutronix.de;
netdev@vger.kernel.org
Cc: Aleksander Jan Bajkowski <redacted>
Subject: [PATCH ethtool-next v2 1/2] sfpid: print all implemented options

SFP modules implement multiple options. Before the “json” option was
introduced, all options were listed. Currently, only the last option is listed. This
commit fixes this bug. Options are represented as array.

Before:
$ ethtool -m sfp-wan
...
	Option values                             : 0x00 0x32
	Option                                    : RATE_SELECT implemented
...
$ ethtool --json -m sfp-wan
[ {
...
        "option_values": [ 0,50 ],
        "option": "RATE_SELECT implemented", ...
    } ]

After:
$ ethtool -m sfp-wan
...
	Option values                             : 0x00 0x32
	Option                                    : RX_LOS implemented
	Option                                    : TX_DISABLE implemented
	Option                                    : RATE_SELECT implemented
...
$ ethtool --json -m sfp-wan
[ {
...
        "option_values": [ 0,50 ],
        "option": [ "RX_LOS implemented","TX_DISABLE
implemented","RATE_SELECT implemented" ], ...
    } ]

Fixes: 4071862f58d8 ("sfpid: Add JSON output handling to --module-info in
SFF8079 modules")
Signed-off-by: Aleksander Jan Bajkowski <redacted>
---
Changes in v2:
 - fix typo introduced -> introduced
 - renamr module_print_array_string() ->
module_print_any_array_string_entry()
---
 module-common.c |  8 ++++++++
 module-common.h |  1 +
 sfpid.c         | 48 ++++++++++++++++++++++++++++++++----------------
 3 files changed, 41 insertions(+), 16 deletions(-)

diff --git a/module-common.c b/module-common.c index 42fccf6..43ff649

100644

--- a/module-common.c
+++ b/module-common.c

@@ -258,6 +258,14 @@ void module_print_any_bool(const char *fn, char

*given_json_fn, bool value,
 		printf("\t%-41s : %s\n", fn, str_value);  }

+void module_print_any_array_string_entry(const char *fn, const char
+*value) {
+	if (is_json_context())
+		print_string(PRINT_JSON, NULL, "%s", value);
+	else
+		printf("\t%-41s : %s\n", fn, 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/module-common.h b/module-common.h index 4063448..f3baf2a

100644

--- a/module-common.h
+++ b/module-common.h

@@ -281,6 +281,7 @@ 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_print_any_array_string_entry(const char *fn, const char
+*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/sfpid.c b/sfpid.c
index 74a6f51..ec5dd95 100644
--- a/sfpid.c
+++ b/sfpid.c

@@ -396,7 +396,6 @@ static void

sff8079_show_wavelength_or_copper_compliance(const __u8 *id)  static void
sff8079_show_options(const __u8 *id)  {
 	static const char *pfx = "Option";
-	char value[64] = "";

 	if (is_json_context()) {
 		open_json_array("option_values", ""); @@ -407,35 +406,52

@@ static void sff8079_show_options(const __u8 *id)
 		printf("\t%-41s : 0x%02x 0x%02x\n", "Option values", id[64],
 		       id[65]);
 	}
+
+	if (is_json_context())
+		open_json_array("option", "");
+
 	if (id[65] & (1 << 1))
-		sprintf(value, "%s", "RX_LOS implemented");
+		module_print_any_array_string_entry(pfx,
+			"RX_LOS implemented");