mvneta: add forgotten initialization of autonegotiation bits
Subsystems (4)
PATCH 1/1 mvneta: add forgotten initialization of autonegotiation bits
The commit 898b2970e2c9 ("mvneta: implement SGMII-based in-band link state signaling")
changed mvneta_adjust_link() so that it does not clear the auto-negotiation bits in MVNETA_GMAC_AUTONEG_CONFIG register. This was necessary for auto-negotiation mode to work.
Unfortunately I haven't checked if these bits are ever initialized. It appears they are not.
This patch adds the missing initialization of the auto-negotiation bits in the MVNETA_GMAC_AUTONEG_CONFIG register.
It fixes the following regression:
https://www.mail-archive.com/[email protected]/msg67928.html
Since the patch was tested to fix a regression, it should be applied to stable tree.
--- drivers/net/ethernet/marvell/mvneta.c | 6 ++++++ 1 file changed, 6 insertions(+)
drivers/net/ethernet/marvell/mvneta.c +6 -0
@@ -1013,6 +1013,12 @@ static void mvneta_defaults_set(struct mvneta_port *pp) val =mvreg_read (pp,MVNETA_GMAC_CLOCK_DIVIDER ); val |=MVNETA_GMAC_1MS_CLOCK_ENABLE ;mvreg_write (pp,MVNETA_GMAC_CLOCK_DIVIDER , val); + }else { + val =mvreg_read (pp,MVNETA_GMAC_AUTONEG_CONFIG ); + val &= ~(MVNETA_GMAC_INBAND_AN_ENABLE | +MVNETA_GMAC_AN_SPEED_EN | +MVNETA_GMAC_AN_DUPLEX_EN ); +mvreg_write (pp,MVNETA_GMAC_AUTONEG_CONFIG , val); }mvneta_set_ucast_table (pp,-1 );
Signature · 1 line
1.9.1
From: Stas Sergeev <[email protected]>
Date: Thu, 18 Jun 2015 18:36:03 +0300
Quoted 18 lines
The commit
898b2970e2c9("mvneta: implement SGMII-based in-band link state signaling")
changedmvneta_adjust_link()so that it does not clear the auto-negotiation bits inMVNETA_GMAC_AUTONEG_CONFIGregister. This was necessary for auto-negotiation mode to work.
Unfortunately I haven't checked if these bits are ever initialized. It appears they are not.
This patch adds the missing initialization of the auto-negotiation bits in theMVNETA_GMAC_AUTONEG_CONFIGregister.
It fixes the following regression:
https://www.mail-archive.com/[email protected]/msg67928.htmlSince the patch was tested to fix a regression, it should be applied to stable tree.
Tested-by Arnaud Ebalard <[email protected]>
Quoted 7 lines
CC Thomas Petazzoni <[email protected]>CC Florian Fainelli <[email protected]>Signed-off-by Stas Sergeev <[email protected]>
Applied, thanks.