net: dsa/b53: change b53_force_port_config() pause argument

[ Upstream commit 3cad1c8b49e93c62f27f4eb34e0ccfde92f4cdc0 ]

Replace the b53_force_port_config() pause argument, which is based on
phylink's MLO_PAUSE_* definitions, to use a pair of booleans.  This
will allow us to move b53_force_port_config() from
b53_phylink_mac_config() to b53_phylink_mac_link_up().

Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: b6a8a5477fe9 ("net: dsa: b53: fix resetting speed and pause on forced link")
Signed-off-by: Sasha Levin <sashal@kernel.org>

diff --git a/drivers/net/dsa/b53/b53_common.c b/drivers/net/dsa/b53/b53_common.c
index fea28b24a1a0b7937c672a1f91e47cb530073470..4de302f20e4f317375d35d8862535efe65cde041 100644 (file)
--- a/drivers/net/dsa/b53/b53_common.c
+++ b/drivers/net/dsa/b53/b53_common.c
@@ -1041,7 +1041,8 @@ static void b53_force_link(struct b53_device *dev, int port, int link)
 }
 
 static void b53_force_port_config(struct b53_device *dev, int port,
-                                 int speed, int duplex, int pause)
+                                 int speed, int duplex,
+                                 bool tx_pause, bool rx_pause)
 {
        u8 reg, val, off;
 
@@ -1079,9 +1080,9 @@ static void b53_force_port_config(struct b53_device *dev, int port,
                return;
        }
 
-       if (pause & MLO_PAUSE_RX)
+       if (rx_pause)
                reg |= PORT_OVERRIDE_RX_FLOW;
-       if (pause & MLO_PAUSE_TX)
+       if (tx_pause)
                reg |= PORT_OVERRIDE_TX_FLOW;
 
        b53_write8(dev, B53_CTRL_PAGE, off, reg);
@@ -1093,22 +1094,24 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
        struct b53_device *dev = ds->priv;
        struct ethtool_eee *p = &dev->ports[port].eee;
        u8 rgmii_ctrl = 0, reg = 0, off;
-       int pause = 0;
+       bool tx_pause = false;
+       bool rx_pause = false;
 
        if (!phy_is_pseudo_fixed_link(phydev))
                return;
 
        /* Enable flow control on BCM5301x's CPU port */
        if (is5301x(dev) && port == dev->cpu_port)
-               pause = MLO_PAUSE_TXRX_MASK;
+               tx_pause = rx_pause = true;
 
        if (phydev->pause) {
                if (phydev->asym_pause)
-                       pause |= MLO_PAUSE_TX;
-               pause |= MLO_PAUSE_RX;
+                       tx_pause = true;
+               rx_pause = true;
        }
 
-       b53_force_port_config(dev, port, phydev->speed, phydev->duplex, pause);
+       b53_force_port_config(dev, port, phydev->speed, phydev->duplex,
+                             tx_pause, rx_pause);
        b53_force_link(dev, port, phydev->link);
 
        if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
@@ -1170,7 +1173,7 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
        } else if (is5301x(dev)) {
                if (port != dev->cpu_port) {
                        b53_force_port_config(dev, dev->cpu_port, 2000,
-                                             DUPLEX_FULL, MLO_PAUSE_TXRX_MASK);
+                                             DUPLEX_FULL, true, true);
                        b53_force_link(dev, dev->cpu_port, 1);
                }
        }
@@ -1260,7 +1263,9 @@ void b53_phylink_mac_config(struct dsa_switch *ds, int port,
 
        if (mode == MLO_AN_FIXED) {
                b53_force_port_config(dev, port, state->speed,
-                                     state->duplex, state->pause);
+                                     state->duplex,
+                                     !!(state->pause & MLO_PAUSE_TX),
+                                     !!(state->pause & MLO_PAUSE_RX));
                return;
        }