From: Danielle Ratson <danieller@nvidia.com>
To: <netdev@vger.kernel.org>
Cc: <mkubecek@suse.cz>, <idosch@nvidia.com>, <petrm@nvidia.com>,
"Danielle Ratson" <danieller@nvidia.com>
Subject: [PATCH ethtool-next 2/5] sfpid: Refactor sff8079_show_all_nl() to separate page retrieval from display
Date: Thu, 7 May 2026 14:47:18 +0300 [thread overview]
Message-ID: <20260507114721.3409128-3-danieller@nvidia.com> (raw)
In-Reply-To: <20260507114721.3409128-1-danieller@nvidia.com>
Restructure sff8079_show_all_nl() to first retrieve all the necessary
pages (A0h and optionally A2h) and then pretty-print them, matching the
pattern already used in cmis_show_all_nl() and sff8636_show_all_nl().
This prepares for the next patch which extends the function with a hex
dump mode.
Note that if reading A2h fails, the function now returns an error
without producing partial output, matching the behavior of the other
parsers.
Assisted-by: Claude:claude-sonnet-4.6
Reviewed-by: Ido Schimmel <idosch@nvidia.com>
Signed-off-by: Danielle Ratson <danieller@nvidia.com>
---
sfpid.c | 29 ++++++++++++++++-------------
1 file changed, 16 insertions(+), 13 deletions(-)
diff --git a/sfpid.c b/sfpid.c
index 228b3ee..f753917 100644
--- a/sfpid.c
+++ b/sfpid.c
@@ -500,6 +500,7 @@ static int sff8079_get_eeprom_page(struct cmd_context *ctx, u8 i2c_address,
int sff8079_show_all_nl(struct cmd_context *ctx)
{
+ bool a2h_present;
u8 *buf;
int ret;
@@ -516,24 +517,26 @@ int sff8079_show_all_nl(struct cmd_context *ctx)
if (ret)
goto out;
+ /* Check if A2h page is present */
+ a2h_present = buf[92] & (1 << 6);
+
+ if (a2h_present) {
+ /* Read A2h page */
+ ret = sff8079_get_eeprom_page(ctx, SFF8079_I2C_ADDRESS_HIGH,
+ buf + ETH_MODULE_SFF_8079_LEN);
+ if (ret) {
+ fprintf(stderr, "Failed to read Page A2h\n");
+ goto out;
+ }
+ }
+
new_json_obj(ctx->json);
open_json_object(NULL);
sff8079_show_all_common(buf);
- /* Finish if A2h page is not present */
- if (!(buf[92] & (1 << 6)))
- goto out_json;
-
- /* Read A2h page */
- ret = sff8079_get_eeprom_page(ctx, SFF8079_I2C_ADDRESS_HIGH,
- buf + ETH_MODULE_SFF_8079_LEN);
- if (ret) {
- fprintf(stderr, "Failed to read Page A2h.\n");
- goto out_json;
- }
+ if (a2h_present)
+ sff8472_show_all(buf);
- sff8472_show_all(buf);
-out_json:
close_json_object();
delete_json_obj();
out:
--
2.51.0
next prev parent reply other threads:[~2026-05-07 11:48 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2026-05-07 11:47 [PATCH ethtool-next 0/5] ethtool: Add 'pages on|off' option for module EEROM hex dump Danielle Ratson
2026-05-07 11:47 ` [PATCH ethtool-next 1/5] module-common: Add module_dump_eeprom_page_hex() helper Danielle Ratson
2026-05-07 11:47 ` Danielle Ratson [this message]
2026-05-07 11:47 ` [PATCH ethtool-next 3/5] module: Add per-type EEPROM page hex dump functions Danielle Ratson
2026-05-07 11:47 ` [PATCH ethtool-next 4/5] netlink: module-eeprom: Add 'hex on pages on' option for page-organized hex dump Danielle Ratson
2026-05-07 11:47 ` [PATCH ethtool-next 5/5] ethtool: Add man page and bash completion for 'pages on|off' Danielle Ratson
2026-05-07 12:07 ` [PATCH ethtool-next 0/5] ethtool: Add 'pages on|off' option for module EEROM hex dump Michal Kubecek
2026-05-07 12:37 ` Danielle Ratson
2026-05-07 14:32 ` Michal Kubecek
2026-05-07 12:23 ` Andrew Lunn
2026-05-07 17:19 ` Danielle Ratson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20260507114721.3409128-3-danieller@nvidia.com \
--to=danieller@nvidia.com \
--cc=idosch@nvidia.com \
--cc=mkubecek@suse.cz \
--cc=netdev@vger.kernel.org \
--cc=petrm@nvidia.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox