net: phy: Uninline PHY ethtool statistics operations

Now that we have moved the PHY ethtool statistics to be dynamically
registered, we no longer need to inline those for ethtool. This used to
be done to avoid cross symbol referencing and allow ethtool to be
decoupled from PHYLIB entirely.

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>

diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c
index 56cfae950472718c9adf804a20408ff271129646..79b4f35d151ecc58c551548ee2306499c911bd63 100644 (file)
--- a/drivers/net/phy/phy.c
+++ b/drivers/net/phy/phy.c
@@ -489,6 +489,54 @@ static void phy_abort_cable_test(struct phy_device *phydev)
                phydev_err(phydev, "Error while aborting cable test");
 }
 
+int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data)
+{
+       if (!phydev->drv)
+               return -EIO;
+
+       mutex_lock(&phydev->lock);
+       phydev->drv->get_strings(phydev, data);
+       mutex_unlock(&phydev->lock);
+
+       return 0;
+}
+EXPORT_SYMBOL(phy_ethtool_get_strings);
+
+int phy_ethtool_get_sset_count(struct phy_device *phydev)
+{
+       int ret;
+
+       if (!phydev->drv)
+               return -EIO;
+
+       if (phydev->drv->get_sset_count &&
+           phydev->drv->get_strings &&
+           phydev->drv->get_stats) {
+               mutex_lock(&phydev->lock);
+               ret = phydev->drv->get_sset_count(phydev);
+               mutex_unlock(&phydev->lock);
+
+               return ret;
+       }
+
+       return -EOPNOTSUPP;
+}
+EXPORT_SYMBOL(phy_ethtool_get_sset_count);
+
+int phy_ethtool_get_stats(struct phy_device *phydev,
+                         struct ethtool_stats *stats, u64 *data)
+{
+       if (!phydev->drv)
+               return -EIO;
+
+       mutex_lock(&phydev->lock);
+       phydev->drv->get_stats(phydev, stats, data);
+       mutex_unlock(&phydev->lock);
+
+       return 0;
+}
+EXPORT_SYMBOL(phy_ethtool_get_stats);
+
 int phy_start_cable_test(struct phy_device *phydev,
                         struct netlink_ext_ack *extack)
 {

diff --git a/include/linux/phy.h b/include/linux/phy.h
index 1592c3d0e12f5266c89057734738167f7d56372a..0403eb7999132b4a92459583971d1763543f212e 100644 (file)
--- a/include/linux/phy.h
+++ b/include/linux/phy.h
@@ -1474,51 +1474,10 @@ int __init mdio_bus_init(void);
 void mdio_bus_exit(void);
 #endif
 
-/* Inline function for use within net/core/ethtool.c (built-in) */
-static inline int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data)
-{
-       if (!phydev->drv)
-               return -EIO;
-
-       mutex_lock(&phydev->lock);
-       phydev->drv->get_strings(phydev, data);
-       mutex_unlock(&phydev->lock);
-
-       return 0;
-}
-
-static inline int phy_ethtool_get_sset_count(struct phy_device *phydev)
-{
-       int ret;
-
-       if (!phydev->drv)
-               return -EIO;
-
-       if (phydev->drv->get_sset_count &&
-           phydev->drv->get_strings &&
-           phydev->drv->get_stats) {
-               mutex_lock(&phydev->lock);
-               ret = phydev->drv->get_sset_count(phydev);
-               mutex_unlock(&phydev->lock);
-
-               return ret;
-       }
-
-       return -EOPNOTSUPP;
-}
-
-static inline int phy_ethtool_get_stats(struct phy_device *phydev,
-                                       struct ethtool_stats *stats, u64 *data)
-{
-       if (!phydev->drv)
-               return -EIO;
-
-       mutex_lock(&phydev->lock);
-       phydev->drv->get_stats(phydev, stats, data);
-       mutex_unlock(&phydev->lock);
-
-       return 0;
-}
+int phy_ethtool_get_strings(struct phy_device *phydev, u8 *data);
+int phy_ethtool_get_sset_count(struct phy_device *phydev);
+int phy_ethtool_get_stats(struct phy_device *phydev,
+                         struct ethtool_stats *stats, u64 *data);
 
 static inline int phy_package_read(struct phy_device *phydev, u32 regnum)
 {

diff --git a/net/ethtool/ioctl.c b/net/ethtool/ioctl.c
index 83f22196d64cccbbee2f846da75826b5916dbb38..441794e0034f571cdb5d2164bde450d263bd8019 100644 (file)
--- a/net/ethtool/ioctl.c
+++ b/net/ethtool/ioctl.c
@@ -135,6 +135,7 @@ static int ethtool_set_features(struct net_device *dev, void __user *useraddr)
 
 static int __ethtool_get_sset_count(struct net_device *dev, int sset)
 {
+       const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;
        const struct ethtool_ops *ops = dev->ethtool_ops;
 
        if (sset == ETH_SS_FEATURES)
@@ -150,8 +151,9 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset)
                return ARRAY_SIZE(phy_tunable_strings);
 
        if (sset == ETH_SS_PHY_STATS && dev->phydev &&
-           !ops->get_ethtool_phy_stats)
-               return phy_ethtool_get_sset_count(dev->phydev);
+           !ops->get_ethtool_phy_stats &&
+           phy_ops && phy_ops->get_sset_count)
+               return phy_ops->get_sset_count(dev->phydev);
 
        if (sset == ETH_SS_LINK_MODES)
                return __ETHTOOL_LINK_MODE_MASK_NBITS;
@@ -165,6 +167,7 @@ static int __ethtool_get_sset_count(struct net_device *dev, int sset)
 static void __ethtool_get_strings(struct net_device *dev,
        u32 stringset, u8 *data)
 {
+       const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;
        const struct ethtool_ops *ops = dev->ethtool_ops;
 
        if (stringset == ETH_SS_FEATURES)
@@ -178,8 +181,9 @@ static void __ethtool_get_strings(struct net_device *dev,
        else if (stringset == ETH_SS_PHY_TUNABLES)
                memcpy(data, phy_tunable_strings, sizeof(phy_tunable_strings));
        else if (stringset == ETH_SS_PHY_STATS && dev->phydev &&
-                !ops->get_ethtool_phy_stats)
-               phy_ethtool_get_strings(dev->phydev, data);
+                !ops->get_ethtool_phy_stats && phy_ops &&
+                phy_ops->get_strings)
+               phy_ops->get_strings(dev->phydev, data);
        else if (stringset == ETH_SS_LINK_MODES)
                memcpy(data, link_mode_names,
                       __ETHTOOL_LINK_MODE_MASK_NBITS * ETH_GSTRING_LEN);
@@ -1929,6 +1933,7 @@ static int ethtool_get_stats(struct net_device *dev, void __user *useraddr)
 
 static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)
 {
+       const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;
        const struct ethtool_ops *ops = dev->ethtool_ops;
        struct phy_device *phydev = dev->phydev;
        struct ethtool_stats stats;
@@ -1938,8 +1943,9 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)
        if (!phydev && (!ops->get_ethtool_phy_stats || !ops->get_sset_count))
                return -EOPNOTSUPP;
 
-       if (dev->phydev && !ops->get_ethtool_phy_stats)
-               n_stats = phy_ethtool_get_sset_count(dev->phydev);
+       if (dev->phydev && !ops->get_ethtool_phy_stats &&
+           phy_ops && phy_ops->get_sset_count)
+               n_stats = phy_ops->get_sset_count(dev->phydev);
        else
                n_stats = ops->get_sset_count(dev, ETH_SS_PHY_STATS);
        if (n_stats < 0)
@@ -1958,8 +1964,9 @@ static int ethtool_get_phy_stats(struct net_device *dev, void __user *useraddr)
                if (!data)
                        return -ENOMEM;
 
-               if (dev->phydev && !ops->get_ethtool_phy_stats) {
-                       ret = phy_ethtool_get_stats(dev->phydev, &stats, data);
+               if (dev->phydev && !ops->get_ethtool_phy_stats &&
+                   phy_ops && phy_ops->get_stats) {
+                       ret = phy_ops->get_stats(dev->phydev, &stats, data);
                        if (ret < 0)
                                goto out;
                } else {

diff --git a/net/ethtool/strset.c b/net/ethtool/strset.c
index 0eed4e4909ab86914be4948b2fe060816c49db45..773634b6b04833a4ef32ffaa5bf0c71a9ea44e4e 100644 (file)
--- a/net/ethtool/strset.c
+++ b/net/ethtool/strset.c
@@ -209,13 +209,15 @@ static void strset_cleanup_data(struct ethnl_reply_data *reply_base)
 static int strset_prepare_set(struct strset_info *info, struct net_device *dev,
                              unsigned int id, bool counts_only)
 {
+       const struct ethtool_phy_ops *phy_ops = ethtool_phy_ops;
        const struct ethtool_ops *ops = dev->ethtool_ops;
        void *strings;
        int count, ret;
 
        if (id == ETH_SS_PHY_STATS && dev->phydev &&
-           !ops->get_ethtool_phy_stats)
-               ret = phy_ethtool_get_sset_count(dev->phydev);
+           !ops->get_ethtool_phy_stats && phy_ops &&
+           phy_ops->get_sset_count)
+               ret = phy_ops->get_sset_count(dev->phydev);
        else if (ops->get_sset_count && ops->get_strings)
                ret = ops->get_sset_count(dev, id);
        else
@@ -231,8 +233,9 @@ static int strset_prepare_set(struct strset_info *info, struct net_device *dev,
                if (!strings)
                        return -ENOMEM;
                if (id == ETH_SS_PHY_STATS && dev->phydev &&
-                   !ops->get_ethtool_phy_stats)
-                       phy_ethtool_get_strings(dev->phydev, strings);
+                   !ops->get_ethtool_phy_stats && phy_ops &&
+                   phy_ops->get_strings)
+                       phy_ops->get_strings(dev->phydev, strings);
                else
                        ops->get_strings(dev, id, strings);
                info->strings = strings;