net: phy: smsc: add support for edpd tunable

This adds support for the EDPD PHY tunable.
Per default EDPD is disabled in interrupt mode, the tunable can be used
to override this, e.g. if the link partner doesn't use EDPD.
The interval to check for energy can be chosen between 1000ms and
2000ms. Note that this value consists of the 1000ms phylib interval
for state machine runs plus the time to wait for energy being detected.

v2:
- consider that phylib core holds phydev->lock when calling the
  phy tunable hooks

Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Simon Horman <simon.horman@corigine.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c
index 659a3ab10d82f3b1f738e5b3d5a262363d7c3b99..0eba69ad5745895d6f00fa522142e37a6b3670de 100644 (file)
--- a/drivers/net/phy/smsc.c
+++ b/drivers/net/phy/smsc.c
@@ -34,6 +34,8 @@
 #define SPECIAL_CTRL_STS_AMDIX_STATE_  0x2000
 
 #define EDPD_MAX_WAIT_DFLT_MS          640
+/* interval between phylib state machine runs in ms */
+#define PHY_STATE_MACH_MS              1000
 
 struct smsc_hw_stat {
        const char *string;
@@ -295,6 +297,79 @@ static void smsc_get_stats(struct phy_device *phydev,
                data[i] = smsc_get_stat(phydev, i);
 }
 
+static int smsc_phy_get_edpd(struct phy_device *phydev, u16 *edpd)
+{
+       struct smsc_phy_priv *priv = phydev->priv;
+
+       if (!priv)
+               return -EOPNOTSUPP;
+
+       if (!priv->edpd_enable)
+               *edpd = ETHTOOL_PHY_EDPD_DISABLE;
+       else if (!priv->edpd_max_wait_ms)
+               *edpd = ETHTOOL_PHY_EDPD_NO_TX;
+       else
+               *edpd = PHY_STATE_MACH_MS + priv->edpd_max_wait_ms;
+
+       return 0;
+}
+
+static int smsc_phy_set_edpd(struct phy_device *phydev, u16 edpd)
+{
+       struct smsc_phy_priv *priv = phydev->priv;
+
+       if (!priv)
+               return -EOPNOTSUPP;
+
+       switch (edpd) {
+       case ETHTOOL_PHY_EDPD_DISABLE:
+               priv->edpd_enable = false;
+               break;
+       case ETHTOOL_PHY_EDPD_NO_TX:
+               priv->edpd_enable = true;
+               priv->edpd_max_wait_ms = 0;
+               break;
+       case ETHTOOL_PHY_EDPD_DFLT_TX_MSECS:
+               edpd = PHY_STATE_MACH_MS + EDPD_MAX_WAIT_DFLT_MS;
+               fallthrough;
+       default:
+               if (phydev->irq != PHY_POLL)
+                       return -EOPNOTSUPP;
+               if (edpd < PHY_STATE_MACH_MS || edpd > PHY_STATE_MACH_MS + 1000)
+                       return -EINVAL;
+               priv->edpd_enable = true;
+               priv->edpd_max_wait_ms = edpd - PHY_STATE_MACH_MS;
+       }
+
+       priv->edpd_mode_set_by_user = true;
+
+       return smsc_phy_config_edpd(phydev);
+}
+
+int smsc_phy_get_tunable(struct phy_device *phydev,
+                        struct ethtool_tunable *tuna, void *data)
+{
+       switch (tuna->id) {
+       case ETHTOOL_PHY_EDPD:
+               return smsc_phy_get_edpd(phydev, data);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+EXPORT_SYMBOL_GPL(smsc_phy_get_tunable);
+
+int smsc_phy_set_tunable(struct phy_device *phydev,
+                        struct ethtool_tunable *tuna, const void *data)
+{
+       switch (tuna->id) {
+       case ETHTOOL_PHY_EDPD:
+               return smsc_phy_set_edpd(phydev, *(u16 *)data);
+       default:
+               return -EOPNOTSUPP;
+       }
+}
+EXPORT_SYMBOL_GPL(smsc_phy_set_tunable);
+
 int smsc_phy_probe(struct phy_device *phydev)
 {
        struct device *dev = &phydev->mdio.dev;

diff --git a/include/linux/smscphy.h b/include/linux/smscphy.h
index 80f37c1dba583cd32f883718ca03466f08dbd645..e1c88627755a9972e9a2893be990aee210953ab5 100644 (file)
--- a/include/linux/smscphy.h
+++ b/include/linux/smscphy.h
@@ -32,6 +32,10 @@ int smsc_phy_config_intr(struct phy_device *phydev);
 irqreturn_t smsc_phy_handle_interrupt(struct phy_device *phydev);
 int smsc_phy_config_init(struct phy_device *phydev);
 int lan87xx_read_status(struct phy_device *phydev);
+int smsc_phy_get_tunable(struct phy_device *phydev,
+                        struct ethtool_tunable *tuna, void *data);
+int smsc_phy_set_tunable(struct phy_device *phydev,
+                        struct ethtool_tunable *tuna, const void *data);
 int smsc_phy_probe(struct phy_device *phydev);
 
 #endif /* __LINUX_SMSCPHY_H__ */