net: dsa: bcm_sf2: Have PHYLINK configure CPU/IMP port(s)

Remove the artificial limitations imposed upon
bcm_sf2_sw_mac_link_{up,down} and allow us to override the link
parameters for IMP port(s) as well as regular ports by accounting for
the special differences that exist there.

Remove the code that did override the link parameters in
bcm_sf2_imp_setup().

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/dsa/bcm_sf2.c b/drivers/net/dsa/bcm_sf2.c
index 10de0cf..572f745 100644 (file)
--- a/drivers/net/dsa/bcm_sf2.c
+++ b/drivers/net/dsa/bcm_sf2.c
@@ -159,7 +159,7 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
 {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
        unsigned int i;
-       u32 reg, offset;
+       u32 reg;
 
        /* Enable the port memories */
        reg = core_readl(priv, CORE_MEM_PSM_VDD_CTRL);
@@ -185,17 +185,6 @@ static void bcm_sf2_imp_setup(struct dsa_switch *ds, int port)
        b53_brcm_hdr_setup(ds, port);
 
        if (port == 8) {
-               offset = bcm_sf2_port_override_offset(priv, port);
-
-               /* Force link status for IMP port */
-               reg = core_readl(priv, offset);
-               reg |= (MII_SW_OR | LINK_STS);
-               if (priv->type == BCM4908_DEVICE_ID)
-                       reg |= GMII_SPEED_UP_2G;
-               else
-                       reg &= ~GMII_SPEED_UP_2G;
-               core_writel(priv, reg, offset);
-
                /* Enable Broadcast, Multicast, Unicast forwarding to IMP port */
                reg = core_readl(priv, CORE_IMP_CTL);
                reg |= (RX_BCST_EN | RX_MCST_EN | RX_UCST_EN);
@@ -826,12 +815,10 @@ static void bcm_sf2_sw_mac_link_down(struct dsa_switch *ds, int port,
        if (priv->wol_ports_mask & BIT(port))
                return;
 
-       if (port != core_readl(priv, CORE_IMP0_PRT_ID)) {
-               offset = bcm_sf2_port_override_offset(priv, port);
-               reg = core_readl(priv, offset);
-               reg &= ~LINK_STS;
-               core_writel(priv, reg, offset);
-       }
+       offset = bcm_sf2_port_override_offset(priv, port);
+       reg = core_readl(priv, offset);
+       reg &= ~LINK_STS;
+       core_writel(priv, reg, offset);
 
        bcm_sf2_sw_mac_link_set(ds, port, interface, false);
 }
@@ -845,51 +832,55 @@ static void bcm_sf2_sw_mac_link_up(struct dsa_switch *ds, int port,
 {
        struct bcm_sf2_priv *priv = bcm_sf2_to_priv(ds);
        struct ethtool_eee *p = &priv->dev->ports[port].eee;
+       u32 reg_rgmii_ctrl = 0;
+       u32 reg, offset;
 
        bcm_sf2_sw_mac_link_set(ds, port, interface, true);
 
-       if (port != core_readl(priv, CORE_IMP0_PRT_ID)) {
-               u32 reg_rgmii_ctrl = 0;
-               u32 reg, offset;
+       offset = bcm_sf2_port_override_offset(priv, port);
 
-               offset = bcm_sf2_port_override_offset(priv, port);
+       if (phy_interface_mode_is_rgmii(interface) ||
+           interface == PHY_INTERFACE_MODE_MII ||
+           interface == PHY_INTERFACE_MODE_REVMII) {
+               reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);
+               reg = reg_readl(priv, reg_rgmii_ctrl);
+               reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN);
 
-               if (interface == PHY_INTERFACE_MODE_RGMII ||
-                   interface == PHY_INTERFACE_MODE_RGMII_TXID ||
-                   interface == PHY_INTERFACE_MODE_MII ||
-                   interface == PHY_INTERFACE_MODE_REVMII) {
-                       reg_rgmii_ctrl = bcm_sf2_reg_rgmii_cntrl(priv, port);
-                       reg = reg_readl(priv, reg_rgmii_ctrl);
-                       reg &= ~(RX_PAUSE_EN | TX_PAUSE_EN);
+               if (tx_pause)
+                       reg |= TX_PAUSE_EN;
+               if (rx_pause)
+                       reg |= RX_PAUSE_EN;
 
-                       if (tx_pause)
-                               reg |= TX_PAUSE_EN;
-                       if (rx_pause)
-                               reg |= RX_PAUSE_EN;
+               reg_writel(priv, reg, reg_rgmii_ctrl);
+       }
 
-                       reg_writel(priv, reg, reg_rgmii_ctrl);
-               }
+       reg = LINK_STS;
+       if (port == 8) {
+               if (priv->type == BCM4908_DEVICE_ID)
+                       reg |= GMII_SPEED_UP_2G;
+               reg |= MII_SW_OR;
+       } else {
+               reg |= SW_OVERRIDE;
+       }
 
-               reg = SW_OVERRIDE | LINK_STS;
-               switch (speed) {
-               case SPEED_1000:
-                       reg |= SPDSTS_1000 << SPEED_SHIFT;
-                       break;
-               case SPEED_100:
-                       reg |= SPDSTS_100 << SPEED_SHIFT;
-                       break;
-               }
+       switch (speed) {
+       case SPEED_1000:
+               reg |= SPDSTS_1000 << SPEED_SHIFT;
+               break;
+       case SPEED_100:
+               reg |= SPDSTS_100 << SPEED_SHIFT;
+               break;
+       }
 
-               if (duplex == DUPLEX_FULL)
-                       reg |= DUPLX_MODE;
+       if (duplex == DUPLEX_FULL)
+               reg |= DUPLX_MODE;
 
-               if (tx_pause)
-                       reg |= TXFLOW_CNTL;
-               if (rx_pause)
-                       reg |= RXFLOW_CNTL;
+       if (tx_pause)
+               reg |= TXFLOW_CNTL;
+       if (rx_pause)
+               reg |= RXFLOW_CNTL;
 
-               core_writel(priv, reg, offset);
-       }
+       core_writel(priv, reg, offset);
 
        if (mode == MLO_AN_PHY && phydev)
                p->eee_enabled = b53_eee_init(ds, port, phydev);