net: dsa: b53: SGMII modes fixes
cover net: dsa: b53: SGMII modes fixes
Hi David,
Here are two additional fixes that are required in order for SGMII to work correctly. This was discovered with using a copper SFP which would make us use SGMII mode, we would actually leave the HW configured in its default mode: Fiber.
Florian Fainelli (2):
net: dsa: b53: Fix B53_SERDES_DIGITAL_CONTROL offset
net: dsa: b53: Also include SGMII for mac_config and mac_link_state
drivers/net/dsa/b53/b53_common.c | 10 ++++++---- drivers/net/dsa/b53/b53_serdes.h | 2 +- 2 files changed, 7 insertions(+), 5 deletions(-)
Signature · 1 line
2.17.1
PATCH 1/1 net: dsa: b53: Don't assign autonegotiation enabled
PHYLINK takes care of filing the right information into state->an_enabled, get rid of the read from the SerDes's BMCR register.
--- drivers/net/dsa/b53/b53_serdes.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
drivers/net/dsa/b53/b53_serdes.c +1 -4
@@ -100,15 +100,13 @@ int b53_serdes_link_state(struct b53_device *dev, int port, struct phylink_link_state *state) {u8 lane =b53_serdes_map_lane (dev, port); -u16 dig, bmcr, bmsr; +u16 dig, bmsr;if (lane ==B53_INVALID_LANE )return 1 ; dig =b53_serdes_read (dev, lane,B53_SERDES_DIGITAL_STATUS ,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 ),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->an_enabled = !!(bmcr &BMCR_ANENABLE ); state->an_complete = !!(bmsr &BMSR_ANEGCOMPLETE ); state->link = !!(dig &LINK_STATUS );if (dig &PAUSE_RESOLUTION_RX_SIDE )
Signature · 1 line
2.17.1
PATCH 1/2 net: dsa: b53: Fix B53_SERDES_DIGITAL_CONTROL offset
In reply to Florian FainelliMaths went wrong, to get 0x20, we need to do 0x1e + (x) * 2, not 0x18, fix that offset so we access the correct registers. This would make us not access the correct SerDes Digital control words, status would be fine and so we would not be correctly flipping between Fiber and SGMII modes resulting in incorrect status words being pulled into the SerDes digital status register.
--- drivers/net/dsa/b53/b53_serdes.h | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/net/dsa/b53/b53_serdes.h +1 -1
@@ -20,7 +20,7 @@#define SERDES_ID0_REV_LETTER_SHIFT 14#define B53_SERDES_MII_REG (x) (0x20 + (x) * 2) -#define B53_SERDES_DIGITAL_CONTROL (x) (0x18 + (x) * 2) +#define B53_SERDES_DIGITAL_CONTROL (x) (0x1e + (x) * 2)#define B53_SERDES_DIGITAL_STATUS 0x28/* SERDES_DIGITAL_CONTROL1 */
Signature · 1 line
2.17.1
PATCH 2/2 net: dsa: b53: Also include SGMII for mac_config and mac_link_state
In reply to Florian FainelliIn both 802.3z and SGMII modes we need to configure the MAC accordingly to flip between Fiber and SGMII modes, and we need to read the MAC status from the SGMII in-band control word.
--- drivers/net/dsa/b53/b53_common.c | 10 ++++++---- 1 file changed, 6 insertions(+), 4 deletions(-)
drivers/net/dsa/b53/b53_common.c +6 -4
@@ -1172,8 +1172,9 @@ int b53_phylink_mac_link_state(struct dsa_switch *ds, int port,struct b53_device *dev = ds->priv;int ret = -EOPNOTSUPP ; -if (phy_interface_mode_is_8023z (state->interface) && - dev->ops->serdes_link_state) +if ((phy_interface_mode_is_8023z (state->interface) || + state->interface ==PHY_INTERFACE_MODE_SGMII ) && + dev->ops->serdes_link_state) ret = dev->ops->serdes_link_state (dev, port, state);return ret;
@@ -1195,8 +1196,9 @@ void b53_phylink_mac_config(struct dsa_switch *ds, int port,return ; } -if (phy_interface_mode_is_8023z (state->interface) && - dev->ops->serdes_config) +if ((phy_interface_mode_is_8023z (state->interface) || + state->interface ==PHY_INTERFACE_MODE_SGMII ) && + dev->ops->serdes_config) dev->ops->serdes_config (dev, port, mode, state); }EXPORT_SYMBOL (b53_phylink_mac_config);
Signature · 1 line
2.17.1