leandrof/linux
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source 
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>
This commit is contained in:
Russell King
2020-06-30 11:25:00 +01:00
committed by David S. Miller
parent d9b8b9845f
commit 3cad1c8b49
1 changed files with 15 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

25
drivers/net/dsa/b53/b53_common.c
View File

@@ -1037,7 +1037,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, 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; u8 reg, val, off;
@@ -1075,9 +1076,9 @@ static void b53_force_port_config(struct b53_device *dev, int port,
return; return;
} }
if (pause & MLO_PAUSE_RX) if (rx_pause)
reg |= PORT_OVERRIDE_RX_FLOW; reg |= PORT_OVERRIDE_RX_FLOW;
if (pause & MLO_PAUSE_TX) if (tx_pause)
reg |= PORT_OVERRIDE_TX_FLOW; reg |= PORT_OVERRIDE_TX_FLOW;
b53_write8(dev, B53_CTRL_PAGE, off, reg); b53_write8(dev, B53_CTRL_PAGE, off, reg);
@@ -1089,22 +1090,24 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
struct b53_device *dev = ds->priv; struct b53_device *dev = ds->priv;
struct ethtool_eee *p = &dev->ports[port].eee; struct ethtool_eee *p = &dev->ports[port].eee;
u8 rgmii_ctrl = 0, reg = 0, off; 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)) if (!phy_is_pseudo_fixed_link(phydev))
return; return;
/* Enable flow control on BCM5301x's CPU port */ /* Enable flow control on BCM5301x's CPU port */
if (is5301x(dev) && port == dev->cpu_port) if (is5301x(dev) && port == dev->cpu_port)
pause = MLO_PAUSE_TXRX_MASK; tx_pause = rx_pause = true;
if (phydev->pause) { if (phydev->pause) {
if (phydev->asym_pause) if (phydev->asym_pause)
pause |= MLO_PAUSE_TX; tx_pause = true;
pause |= MLO_PAUSE_RX; 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); b53_force_link(dev, port, phydev->link);
if (is531x5(dev) && phy_interface_is_rgmii(phydev)) { if (is531x5(dev) && phy_interface_is_rgmii(phydev)) {
@@ -1166,7 +1169,7 @@ static void b53_adjust_link(struct dsa_switch *ds, int port,
} else if (is5301x(dev)) { } else if (is5301x(dev)) {
if (port != dev->cpu_port) { if (port != dev->cpu_port) {
b53_force_port_config(dev, dev->cpu_port, 2000, 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); b53_force_link(dev, dev->cpu_port, 1);
} }
} }
@@ -1256,7 +1259,9 @@ void b53_phylink_mac_config(struct dsa_switch *ds, int port,
if (mode == MLO_AN_FIXED) { if (mode == MLO_AN_FIXED) {
b53_force_port_config(dev, port, state->speed, 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; return;
} }