luck/tmp_suning_uos_patched
1
0
Fork 1
Code Issues Pull Requests Packages Projects Releases Wiki Activity

net: dsa: b53: Don't assign autonegotiation enabled

Browse Source 
PHYLINK takes care of filing the right information into
state->an_enabled, get rid of the read from the SerDes's BMCR register.

Fixes: 0e01491de6 ("net: dsa: b53: Add SerDes support")
Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Florian Fainelli 2018-09-21 15:30:05 -07:00 committed by David S. Miller
parent 5b9b0a80aa
commit e24cf6b389
1 changed files with 1 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
drivers/net/dsa/b53/b53_serdes.c
View File

@ -100,15 +100,13 @@ int b53_serdes_link_state(struct b53_device *dev, int port,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
u8 lane = b53_serdes_map_lane(dev, port); u8 lane = b53_serdes_map_lane(dev, port);
u16 dig, bmcr, bmsr; u16 dig, bmsr;
if (lane == B53_INVALID_LANE) if (lane == B53_INVALID_LANE)
return 1; return 1;
dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS, dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS,
SERDES_DIGITAL_BLK); SERDES_DIGITAL_BLK);
bmcr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMCR),
SERDES_MII_BLK);
bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR), bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR),
SERDES_MII_BLK); SERDES_MII_BLK);
@ -129,7 +127,6 @@ int b53_serdes_link_state(struct b53_device *dev, int port,
} }
state->duplex = dig & DUPLEX_STATUS ? DUPLEX_FULL : DUPLEX_HALF; state->duplex = dig & DUPLEX_STATUS ? DUPLEX_FULL : DUPLEX_HALF;
state->an_enabled = !!(bmcr & BMCR_ANENABLE);
state->an_complete = !!(bmsr & BMSR_ANEGCOMPLETE); state->an_complete = !!(bmsr & BMSR_ANEGCOMPLETE);
state->link = !!(dig & LINK_STATUS); state->link = !!(dig & LINK_STATUS);
if (dig & PAUSE_RESOLUTION_RX_SIDE) if (dig & PAUSE_RESOLUTION_RX_SIDE)