net: sfp: report error on failure to read sfp soft status
Subsystems (4)
PATCH 1/1 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 <[email protected]>
--- drivers/net/phy/sfp.c | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-)
drivers/net/phy/sfp.c +9 -2
@@ -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;
Signature · 1 line
2.20.1
From: Russell King <[email protected]>
Date: Tue, 17 Dec 2019 13:50:29 +0000
Quoted 5 lines
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 <[email protected]>
Applied.