diff options
| author | Russell King <rmk+kernel@armlinux.org.uk> | 2020-01-03 23:13:28 +0000 |
|---|---|---|
| committer | Russell King <rmk+kernel@armlinux.org.uk> | 2020-06-29 01:19:11 +0100 |
| commit | eb7aabfc904d0718da588181f7f7ebbbe2980e7c (patch) | |
| tree | 70956fa3cfa11d3b92bf0e360fa772e0e557615f | |
| parent | e23f0ab148356873fe7b754459ac66a3fe4f8979 (diff) | |
net: phy: add resolved pause support
Allow phylib drivers to pass the hardware-resolved pause state to MAC
drivers, rather than using the software-based pause resolution code.
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
| -rw-r--r-- | drivers/net/phy/phy_device.c | 6 | ||||
| -rw-r--r-- | include/linux/phy.h | 9 |
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c index 433f87a2844b..a5d5b6fbe83d 100644 --- a/drivers/net/phy/phy_device.c +++ b/drivers/net/phy/phy_device.c @@ -2457,6 +2457,12 @@ void phy_get_pause(struct phy_device *phydev, bool *tx_pause, bool *rx_pause) return; } + if (phydev->resolved_pause_valid) { + *tx_pause = phydev->resolved_tx_pause; + *rx_pause = phydev->resolved_rx_pause; + return; + } + return linkmode_resolve_pause(phydev->advertising, phydev->lp_advertising, tx_pause, rx_pause); diff --git a/include/linux/phy.h b/include/linux/phy.h index 250c6f2f04b3..fb162b56343d 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -430,6 +430,15 @@ struct phy_device { int pause; int asym_pause; + /* + * private to phylib: the resolved pause state - only valid if + * resolved_pause_valid is true. only phy drivers and phylib + * should touch this. + */ + bool resolved_pause_valid; + bool resolved_tx_pause; + bool resolved_rx_pause; + /* Union of PHY and Attached devices' supported link modes */ /* See ethtool.h for more info */ __ETHTOOL_DECLARE_LINK_MODE_MASK(supported); |