diff options
| author |   Russell King <rmk+kernel@armlinux.org.uk> | 2019-12-17 13:50:29 +0000 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-12-19 17:26:07 -0800 |
| commit | 0dea4d039a7fdd97790a71da37c1ce67a5b52769 (patch) | |
| tree | 628fef0b7ceb4e4da3eaf73342504a077e004e3e /drivers/net/phy/sfp.c | |
| parent | Merge branch 'phylib-consolidation' (diff) | |
| download | linux-dev-0dea4d039a7fdd97790a71da37c1ce67a5b52769.tar.xz linux-dev-0dea4d039a7fdd97790a71da37c1ce67a5b52769.zip | |
net: sfp: report error on failure to read sfp soft status
Report a rate-limited error if we fail to read the SFP soft status,
and preserve the current status in that case. This avoids I2C bus
errors from triggering a link flap.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/phy/sfp.c | 11 |
1 files changed, 9 insertions, 2 deletions
diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index e54aef921038..73c2969f11a4 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -442,13 +442,20 @@ static unsigned int sfp_soft_get_state(struct sfp *sfp) { unsigned int state = 0; u8 status; + int ret; - if (sfp_read(sfp, true, SFP_STATUS, &status, sizeof(status)) == - sizeof(status)) { + ret = sfp_read(sfp, true, SFP_STATUS, &status, sizeof(status)); + if (ret == sizeof(status)) { if (status & SFP_STATUS_RX_LOS) state |= SFP_F_LOS; if (status & SFP_STATUS_TX_FAULT) state |= SFP_F_TX_FAULT; + } else { + dev_err_ratelimited(sfp->dev, + "failed to read SFP soft status: %d\n", + ret); + /* Preserve the current state */ + state = sfp->state; } return state & sfp->state_soft_mask; |