From c7984331d3e7273117a1de52e125a0bab0199333 Mon Sep 17 00:00:00 2001 From: Russell King Date: Thu, 1 Oct 2015 23:10:05 +0100 Subject: phylink: add module EEPROM support Add support for reading module EEPROMs through phylink. Reviewed-by: Florian Fainelli Signed-off-by: Russell King --- drivers/net/phy/phylink.c | 63 +++++++++++++++++++++++++++++++++++++++++++++++ include/linux/phylink.h | 12 +++++++++ 2 files changed, 75 insertions(+) diff --git a/drivers/net/phy/phylink.c b/drivers/net/phy/phylink.c index 67fe6c0effce..8afc695fe7e5 100644 --- a/drivers/net/phy/phylink.c +++ b/drivers/net/phy/phylink.c @@ -962,6 +962,36 @@ 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; + + mutex_lock(&pl->config_mutex); + if (pl->module_ops) + ret = pl->module_ops->get_module_info(pl->module_data, + modinfo); + mutex_unlock(&pl->config_mutex); + + 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; + + mutex_lock(&pl->config_mutex); + if (pl->module_ops) + ret = pl->module_ops->get_module_eeprom(pl->module_data, ee, + buf); + mutex_unlock(&pl->config_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(phylink_ethtool_get_module_eeprom); + int phylink_init_eee(struct phylink *pl, bool clk_stop_enable) { int ret = -EPROTONOSUPPORT; @@ -1238,6 +1268,39 @@ EXPORT_SYMBOL_GPL(phylink_mii_ioctl); +int phylink_register_module(struct phylink *pl, void *data, + const struct phylink_module_ops *ops) +{ + int ret = -EBUSY; + + mutex_lock(&pl->config_mutex); + if (!pl->module_ops) { + pl->module_ops = ops; + pl->module_data = data; + ret = 0; + } + mutex_unlock(&pl->config_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(phylink_register_module); + +int phylink_unregister_module(struct phylink *pl, void *data) +{ + int ret = -EINVAL; + + mutex_lock(&pl->config_mutex); + if (pl->module_data == data) { + pl->module_ops = NULL; + pl->module_data = NULL; + ret = 0; + } + mutex_unlock(&pl->config_mutex); + + return ret; +} +EXPORT_SYMBOL_GPL(phylink_unregister_module); + void phylink_disable(struct phylink *pl) { set_bit(PHYLINK_DISABLE_LINK, &pl->phylink_disable_state); diff --git a/include/linux/phylink.h b/include/linux/phylink.h index 4872f498e335..1a5968267834 100644 --- a/include/linux/phylink.h +++ b/include/linux/phylink.h @@ -111,6 +111,11 @@ struct phylink_mac_ops { struct phy_device *); }; +struct phylink_module_ops { + int (*get_module_info)(void *, struct ethtool_modinfo *); + int (*get_module_eeprom)(void *, struct ethtool_eeprom *, u8 *); +}; + struct phylink *phylink_create(struct net_device *, struct device_node *, phy_interface_t iface, const struct phylink_mac_ops *ops); void phylink_destroy(struct phylink *); @@ -136,12 +141,19 @@ 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_init_eee(struct phylink *, bool); 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 *); int phylink_mii_ioctl(struct phylink *, struct ifreq *, int); +int phylink_register_module(struct phylink *, void *, + const struct phylink_module_ops *); +int phylink_unregister_module(struct phylink *, void *); + int phylink_set_link(struct phylink *pl, unsigned int mode, u8 port, const unsigned long *support); void phylink_disable(struct phylink *pl); -- cgit