| Message ID | 201211021909.25473.vitas@nppfactor.kiev.ua |
|---|---|
| State | Accepted, archived |
| Delegated to: | David Miller |
| Headers | show |
From: Vitalii Demianets <vitas@nppfactor.kiev.ua> Date: Fri, 2 Nov 2012 19:09:24 +0200 > When underlying phy driver restores its state very fast after being brought > down and up so that macb driver function macb_handle_link_change() was never > called with link state "down", driver's internal representation of phy speed > and duplex (bp->speed and bp->duplex) didn't change. So, macb driver sees no > reason to perform actual write to the NCFGR register, although the speed and > duplex settings in that register were reset when interface was brought down > and up. In that case actual phy speed and duplex differ from NCFGR settings. > The patch fixes that by keeping internal driver representation of speed and > duplex in sync with actual content of NCFGR. > > Signed-off-by: Vitalii Demianets <vitas@nppfactor.kiev.ua> Applied. -- To unsubscribe from this list: send the line "unsubscribe netdev" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
diff --git a/drivers/net/ethernet/cadence/macb.c b/drivers/net/ethernet/cadence/macb.c index c374875..13c3c33 100644 --- a/drivers/net/ethernet/cadence/macb.c +++ b/drivers/net/ethernet/cadence/macb.c @@ -1031,6 +1031,8 @@ static void macb_init_hw(struct macb *bp) config |= MACB_BIT(NBC); /* No BroadCast */ config |= macb_dbw(bp); macb_writel(bp, NCFGR, config); + bp->speed = SPEED_10; + bp->duplex = DUPLEX_HALF; macb_configure_dma(bp);
When underlying phy driver restores its state very fast after being brought down and up so that macb driver function macb_handle_link_change() was never called with link state "down", driver's internal representation of phy speed and duplex (bp->speed and bp->duplex) didn't change. So, macb driver sees no reason to perform actual write to the NCFGR register, although the speed and duplex settings in that register were reset when interface was brought down and up. In that case actual phy speed and duplex differ from NCFGR settings. The patch fixes that by keeping internal driver representation of speed and duplex in sync with actual content of NCFGR. Signed-off-by: Vitalii Demianets <vitas@nppfactor.kiev.ua> --- drivers/net/ethernet/cadence/macb.c | 2 ++ 1 files changed, 2 insertions(+), 0 deletions(-)