From: Roel Kluin <roel.kluin@gmail.com>
To: linux-net-drivers@solarflare.com
Cc: netdev@vger.kernel.org, "David S. Miller" <davem@davemloft.net>,
Andrew Morton <akpm@linux-foundation.org>
Subject: [PATCH] sfc: mdio_clause45_read errors go unnoticed
Date: Fri, 27 Feb 2009 17:31:33 +0100 [thread overview]
Message-ID: <49A81565.3030004@gmail.com> (raw)
This patch was not tested in any way, but:
since commit 27dd2caca4eabe7c13a052b7456495ba75535e6a
------------------------------>8-------------8<---------------------------------
mdio_clause45_read may return -ERR, but since 'devices' is unsigned, this is not
noticed.
Signed-off-by: Roel Kluin <roel.kluin@gmail.com>
---
diff --git a/drivers/net/sfc/mdio_10g.c b/drivers/net/sfc/mdio_10g.c
index f9e2f95..bcb5ddc 100644
--- a/drivers/net/sfc/mdio_10g.c
+++ b/drivers/net/sfc/mdio_10g.c
@@ -126,23 +126,29 @@ int mdio_clause45_check_mmds(struct efx_nic *efx,
unsigned int mmd_mask, unsigned int fatal_mask)
{
u32 devices;
- int mmd = 0, probe_mmd;
+ int ret, mmd = 0, probe_mmd;
/* Historically we have probed the PHYXS to find out what devices are
* present,but that doesn't work so well if the PHYXS isn't expected
* to exist, if so just find the first item in the list supplied. */
probe_mmd = (mmd_mask & MDIO_MMDREG_DEVS_PHYXS) ? MDIO_MMD_PHYXS :
__ffs(mmd_mask);
- devices = (mdio_clause45_read(efx, efx->mii.phy_id,
- probe_mmd, MDIO_MMDREG_DEVS0) |
- mdio_clause45_read(efx, efx->mii.phy_id,
- probe_mmd, MDIO_MMDREG_DEVS1) << 16);
- /* Check all the expected MMDs are present */
- if (devices < 0) {
+ ret = mdio_clause45_read(efx, efx->mii.phy_id, probe_mmd,
+ MDIO_MMDREG_DEVS0);
+ if (ret >= 0) {
+ devices = ret;
+ ret = mdio_clause45_read(efx, efx->mii.phy_id, probe_mmd,
+ MDIO_MMDREG_DEVS1);
+ }
+
+ /* Check all the expected MMDs were present */
+ if (ret < 0) {
EFX_ERR(efx, "failed to read devices present\n");
return -EIO;
}
+ devices |= ret << 16;
+
if ((devices & mmd_mask) != mmd_mask) {
EFX_ERR(efx, "required MMDs not present: got %x, "
"wanted %x\n", devices, mmd_mask);
next reply other threads:[~2009-02-27 16:31 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-02-27 16:31 Roel Kluin [this message]
2009-02-27 16:45 ` [PATCH] sfc: mdio_clause45_read errors go unnoticed Ben Hutchings
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=49A81565.3030004@gmail.com \
--to=roel.kluin@gmail.com \
--cc=akpm@linux-foundation.org \
--cc=davem@davemloft.net \
--cc=linux-net-drivers@solarflare.com \
--cc=netdev@vger.kernel.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.