| 123456789101112131415161718192021222324252627282930313233343536373839404142434445464748495051525354555657585960616263646566676869707172737475767778798081828384858687888990919293949596979899100101102103104105106107108109110111112113114115116117118119120121122123 |
- From: Russell King <[email protected]>
- Date: Thu, 1 Oct 2015 23:10:05 +0100
- Subject: [PATCH] phylink: add module EEPROM support
- Add support for reading module EEPROMs through phylink.
- Reviewed-by: Florian Fainelli <[email protected]>
- Signed-off-by: Russell King <[email protected]>
- ---
- --- a/drivers/net/phy/phylink.c
- +++ b/drivers/net/phy/phylink.c
- @@ -930,6 +930,36 @@ int phylink_ethtool_set_pauseparam(struc
- }
- 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;
- @@ -1115,6 +1145,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);
- --- a/include/linux/phylink.h
- +++ b/include/linux/phylink.h
- @@ -74,6 +74,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 *);
- @@ -96,12 +101,19 @@ void phylink_ethtool_get_pauseparam(stru
- 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);
|
