summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@armlinux.org.uk>2020-01-03 23:13:28 +0000
committerRussell King <rmk+kernel@armlinux.org.uk>2020-02-28 12:36:56 +0000
commit6f6fefc0cc4a0913a651128d997d5b89ca3a52ce (patch)
treee757cfb14bf87402a54fcc31d052eb4940ed260f
parent6a667533f25bf38d2ea79115b43dd8877e34edfb (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.c6
-rw-r--r--include/linux/phy.h9
2 files changed, 15 insertions, 0 deletions
diff --git a/drivers/net/phy/phy_device.c b/drivers/net/phy/phy_device.c
index 67515916722b..470c97d90b9f 100644
--- a/drivers/net/phy/phy_device.c
+++ b/drivers/net/phy/phy_device.c
@@ -2409,6 +2409,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 d0cd2f95dca0..8fc9583f7fa9 100644
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -406,6 +406,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);