sfp/phylink: move module EEPROM ethtool access into netdev core ethtool
Provide a pointer to the SFP bus in struct net_device, so that the ethtool module EEPROM methods can access the SFP directly, rather than needing every user to provide a hook for it. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Reviewed-by: Andrew Lunn <andrew@lunn.ch> Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk> Signed-off-by: Florian Fainelli <f.fainelli@gmail.com> Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
parent
c6ab3008b6
commit
e679c9c1db
|
@ -4075,22 +4075,6 @@ static int mvneta_ethtool_set_wol(struct net_device *dev,
|
|||
return ret;
|
||||
}
|
||||
|
||||
static int mvneta_ethtool_get_module_info(struct net_device *dev,
|
||||
struct ethtool_modinfo *modinfo)
|
||||
{
|
||||
struct mvneta_port *pp = netdev_priv(dev);
|
||||
|
||||
return phylink_ethtool_get_module_info(pp->phylink, modinfo);
|
||||
}
|
||||
|
||||
static int mvneta_ethtool_get_module_eeprom(struct net_device *dev,
|
||||
struct ethtool_eeprom *ee, u8 *buf)
|
||||
{
|
||||
struct mvneta_port *pp = netdev_priv(dev);
|
||||
|
||||
return phylink_ethtool_get_module_eeprom(pp->phylink, ee, buf);
|
||||
}
|
||||
|
||||
static int mvneta_ethtool_get_eee(struct net_device *dev,
|
||||
struct ethtool_eee *eee)
|
||||
{
|
||||
|
@ -4165,8 +4149,6 @@ static const struct ethtool_ops mvneta_eth_tool_ops = {
|
|||
.set_link_ksettings = mvneta_ethtool_set_link_ksettings,
|
||||
.get_wol = mvneta_ethtool_get_wol,
|
||||
.set_wol = mvneta_ethtool_set_wol,
|
||||
.get_module_info = mvneta_ethtool_get_module_info,
|
||||
.get_module_eeprom = mvneta_ethtool_get_module_eeprom,
|
||||
.get_eee = mvneta_ethtool_get_eee,
|
||||
.set_eee = mvneta_ethtool_set_eee,
|
||||
};
|
||||
|
|
|
@ -1250,34 +1250,6 @@ int phylink_ethtool_set_pauseparam(struct phylink *pl,
|
|||
}
|
||||
EXPORT_SYMBOL_GPL(phylink_ethtool_set_pauseparam);
|
||||
|
||||
int phylink_ethtool_get_module_info(struct phylink *pl,
|
||||
struct ethtool_modinfo *modinfo)
|
||||
{
|
||||
int ret = -EOPNOTSUPP;
|
||||
|
||||
WARN_ON(!lockdep_rtnl_is_held());
|
||||
|
||||
if (pl->sfp_bus)
|
||||
ret = sfp_get_module_info(pl->sfp_bus, modinfo);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(phylink_ethtool_get_module_info);
|
||||
|
||||
int phylink_ethtool_get_module_eeprom(struct phylink *pl,
|
||||
struct ethtool_eeprom *ee, u8 *buf)
|
||||
{
|
||||
int ret = -EOPNOTSUPP;
|
||||
|
||||
WARN_ON(!lockdep_rtnl_is_held());
|
||||
|
||||
if (pl->sfp_bus)
|
||||
ret = sfp_get_module_eeprom(pl->sfp_bus, ee, buf);
|
||||
|
||||
return ret;
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(phylink_ethtool_get_module_eeprom);
|
||||
|
||||
/**
|
||||
* phylink_ethtool_get_eee_err() - read the energy efficient ethernet error
|
||||
* counter
|
||||
|
|
|
@ -342,6 +342,7 @@ static int sfp_register_bus(struct sfp_bus *bus)
|
|||
}
|
||||
if (bus->started)
|
||||
bus->socket_ops->start(bus->sfp);
|
||||
bus->netdev->sfp_bus = bus;
|
||||
bus->registered = true;
|
||||
return 0;
|
||||
}
|
||||
|
@ -356,6 +357,7 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
|
|||
if (bus->phydev && ops && ops->disconnect_phy)
|
||||
ops->disconnect_phy(bus->upstream);
|
||||
}
|
||||
bus->netdev->sfp_bus = NULL;
|
||||
bus->registered = false;
|
||||
}
|
||||
|
||||
|
@ -371,8 +373,6 @@ static void sfp_unregister_bus(struct sfp_bus *bus)
|
|||
*/
|
||||
int sfp_get_module_info(struct sfp_bus *bus, struct ethtool_modinfo *modinfo)
|
||||
{
|
||||
if (!bus->registered)
|
||||
return -ENOIOCTLCMD;
|
||||
return bus->socket_ops->module_info(bus->sfp, modinfo);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(sfp_get_module_info);
|
||||
|
@ -391,8 +391,6 @@ EXPORT_SYMBOL_GPL(sfp_get_module_info);
|
|||
int sfp_get_module_eeprom(struct sfp_bus *bus, struct ethtool_eeprom *ee,
|
||||
u8 *data)
|
||||
{
|
||||
if (!bus->registered)
|
||||
return -ENOIOCTLCMD;
|
||||
return bus->socket_ops->module_eeprom(bus->sfp, ee, data);
|
||||
}
|
||||
EXPORT_SYMBOL_GPL(sfp_get_module_eeprom);
|
||||
|
|
|
@ -58,6 +58,7 @@ struct device;
|
|||
struct phy_device;
|
||||
struct dsa_port;
|
||||
|
||||
struct sfp_bus;
|
||||
/* 802.11 specific */
|
||||
struct wireless_dev;
|
||||
/* 802.15.4 specific */
|
||||
|
@ -1662,6 +1663,7 @@ enum netdev_priv_flags {
|
|||
* @priomap: XXX: need comments on this one
|
||||
* @phydev: Physical device may attach itself
|
||||
* for hardware timestamping
|
||||
* @sfp_bus: attached &struct sfp_bus structure.
|
||||
*
|
||||
* @qdisc_tx_busylock: lockdep class annotating Qdisc->busylock spinlock
|
||||
* @qdisc_running_key: lockdep class annotating Qdisc->running seqcount
|
||||
|
@ -1945,6 +1947,7 @@ struct net_device {
|
|||
struct netprio_map __rcu *priomap;
|
||||
#endif
|
||||
struct phy_device *phydev;
|
||||
struct sfp_bus *sfp_bus;
|
||||
struct lock_class_key *qdisc_tx_busylock;
|
||||
struct lock_class_key *qdisc_running_key;
|
||||
bool proto_down;
|
||||
|
|
|
@ -219,9 +219,6 @@ void phylink_ethtool_get_pauseparam(struct phylink *,
|
|||
struct ethtool_pauseparam *);
|
||||
int phylink_ethtool_set_pauseparam(struct phylink *,
|
||||
struct ethtool_pauseparam *);
|
||||
int phylink_ethtool_get_module_info(struct phylink *, struct ethtool_modinfo *);
|
||||
int phylink_ethtool_get_module_eeprom(struct phylink *,
|
||||
struct ethtool_eeprom *, u8 *);
|
||||
int phylink_get_eee_err(struct phylink *);
|
||||
int phylink_ethtool_get_eee(struct phylink *, struct ethtool_eee *);
|
||||
int phylink_ethtool_set_eee(struct phylink *, struct ethtool_eee *);
|
||||
|
|
|
@ -22,6 +22,7 @@
|
|||
#include <linux/bitops.h>
|
||||
#include <linux/uaccess.h>
|
||||
#include <linux/vmalloc.h>
|
||||
#include <linux/sfp.h>
|
||||
#include <linux/slab.h>
|
||||
#include <linux/rtnetlink.h>
|
||||
#include <linux/sched/signal.h>
|
||||
|
@ -2245,6 +2246,9 @@ static int __ethtool_get_module_info(struct net_device *dev,
|
|||
const struct ethtool_ops *ops = dev->ethtool_ops;
|
||||
struct phy_device *phydev = dev->phydev;
|
||||
|
||||
if (dev->sfp_bus)
|
||||
return sfp_get_module_info(dev->sfp_bus, modinfo);
|
||||
|
||||
if (phydev && phydev->drv && phydev->drv->module_info)
|
||||
return phydev->drv->module_info(phydev, modinfo);
|
||||
|
||||
|
@ -2279,6 +2283,9 @@ static int __ethtool_get_module_eeprom(struct net_device *dev,
|
|||
const struct ethtool_ops *ops = dev->ethtool_ops;
|
||||
struct phy_device *phydev = dev->phydev;
|
||||
|
||||
if (dev->sfp_bus)
|
||||
return sfp_get_module_eeprom(dev->sfp_bus, ee, data);
|
||||
|
||||
if (phydev && phydev->drv && phydev->drv->module_eeprom)
|
||||
return phydev->drv->module_eeprom(phydev, ee, data);
|
||||
|
||||
|
|
Loading…
Reference in a new issue