From: Ivan Bornyakov <i.bornyakov@metrotek.ru>
To: netdev@vger.kernel.org
Cc: Ivan Bornyakov <i.bornyakov@metrotek.ru>,
linux@armlinux.org.uk, andrew@lunn.ch, hkallweit1@gmail.com,
davem@davemloft.net, edumazet@google.com, kuba@kernel.org,
pabeni@redhat.com, linux-kernel@vger.kernel.org,
system@metrotek.ru
Subject: [PATCH net v2 2/2] net: sfp: avoid EEPROM read of absent SFP module
Date: Thu, 6 Apr 2023 16:08:33 +0300 [thread overview]
Message-ID: <20230406130833.32160-3-i.bornyakov@metrotek.ru> (raw)
In-Reply-To: <20230406130833.32160-1-i.bornyakov@metrotek.ru>
If SFP module is not present, it is sensible to fail sfp_module_eeprom()
and sfp_module_eeprom_by_page() early to avoid excessive I2C transfers
which are garanteed to fail.
Suggested-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Ivan Bornyakov <i.bornyakov@metrotek.ru>
---
drivers/net/phy/sfp.c | 6 ++++++
1 file changed, 6 insertions(+)
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c
index 5663a184644d..6f32c2ab415d 100644
--- a/drivers/net/phy/sfp.c
+++ b/drivers/net/phy/sfp.c
@@ -2481,6 +2481,9 @@ static int sfp_module_eeprom(struct sfp *sfp, struct ethtool_eeprom *ee,
unsigned int first, last, len;
int ret;
+ if (!(sfp->state & SFP_F_PRESENT))
+ return -ENODEV;
+
if (ee->len == 0)
return -EINVAL;
@@ -2513,6 +2516,9 @@ static int sfp_module_eeprom_by_page(struct sfp *sfp,
const struct ethtool_module_eeprom *page,
struct netlink_ext_ack *extack)
{
+ if (!(sfp->state & SFP_F_PRESENT))
+ return -ENODEV;
+
if (page->bank) {
NL_SET_ERR_MSG(extack, "Banks not supported");
return -EOPNOTSUPP;
--
2.39.2
next prev parent reply other threads:[~2023-04-06 13:09 UTC|newest]
Thread overview: 6+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-04-06 13:08 [PATCH net v2 0/2] fix " Ivan Bornyakov
2023-04-06 13:08 ` [PATCH net v2 1/2] net: sfp: initialize sfp->i2c_block_size at sfp allocation Ivan Bornyakov
2023-04-06 14:05 ` Andrew Lunn
2023-04-06 13:08 ` Ivan Bornyakov [this message]
2023-04-06 14:06 ` [PATCH net v2 2/2] net: sfp: avoid EEPROM read of absent SFP module Andrew Lunn
2023-04-09 15:10 ` [PATCH net v2 0/2] fix " patchwork-bot+netdevbpf
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=20230406130833.32160-3-i.bornyakov@metrotek.ru \
--to=i.bornyakov@metrotek.ru \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=edumazet@google.com \
--cc=hkallweit1@gmail.com \
--cc=kuba@kernel.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=system@metrotek.ru \
/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
all inboxes | Powered by JetHome®