mirror of
https://github.com/torvalds/linux.git
synced 2024-12-05 18:41:23 +00:00
net: stmmac: Set MAC's flow control register to reflect current settings
Currently, pause frame register GMAC_RX_FLOW_CTRL_RFE is not updated
correctly when 'ethtool -A <IFACE> autoneg off rx off tx off' command
is issued. This fix ensures the flow control change is reflected directly
in the GMAC_RX_FLOW_CTRL_RFE register.
Fixes: 46f69ded98
("net: stmmac: Use resolved link config in mac_link_up()")
Cc: <stable@vger.kernel.org> # 5.10.x
Signed-off-by: Goh, Wei Sheng <wei.sheng.goh@intel.com>
Signed-off-by: Noor Azura Ahmad Tarmizi <noor.azura.ahmad.tarmizi@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
2a83891130
commit
cc3d2b5fc0
@ -748,6 +748,8 @@ static void dwmac4_flow_ctrl(struct mac_device_info *hw, unsigned int duplex,
|
|||||||
if (fc & FLOW_RX) {
|
if (fc & FLOW_RX) {
|
||||||
pr_debug("\tReceive Flow-Control ON\n");
|
pr_debug("\tReceive Flow-Control ON\n");
|
||||||
flow |= GMAC_RX_FLOW_CTRL_RFE;
|
flow |= GMAC_RX_FLOW_CTRL_RFE;
|
||||||
|
} else {
|
||||||
|
pr_debug("\tReceive Flow-Control OFF\n");
|
||||||
}
|
}
|
||||||
writel(flow, ioaddr + GMAC_RX_FLOW_CTRL);
|
writel(flow, ioaddr + GMAC_RX_FLOW_CTRL);
|
||||||
|
|
||||||
|
@ -1061,8 +1061,16 @@ static void stmmac_mac_link_up(struct phylink_config *config,
|
|||||||
ctrl |= priv->hw->link.duplex;
|
ctrl |= priv->hw->link.duplex;
|
||||||
|
|
||||||
/* Flow Control operation */
|
/* Flow Control operation */
|
||||||
if (tx_pause && rx_pause)
|
if (rx_pause && tx_pause)
|
||||||
stmmac_mac_flow_ctrl(priv, duplex);
|
priv->flow_ctrl = FLOW_AUTO;
|
||||||
|
else if (rx_pause && !tx_pause)
|
||||||
|
priv->flow_ctrl = FLOW_RX;
|
||||||
|
else if (!rx_pause && tx_pause)
|
||||||
|
priv->flow_ctrl = FLOW_TX;
|
||||||
|
else
|
||||||
|
priv->flow_ctrl = FLOW_OFF;
|
||||||
|
|
||||||
|
stmmac_mac_flow_ctrl(priv, duplex);
|
||||||
|
|
||||||
if (ctrl != old_ctrl)
|
if (ctrl != old_ctrl)
|
||||||
writel(ctrl, priv->ioaddr + MAC_CTRL_REG);
|
writel(ctrl, priv->ioaddr + MAC_CTRL_REG);
|
||||||
|
Loading…
Reference in New Issue
Block a user