Skip to content

Commit

Permalink
net: phylink: add phylink_speed_(up|down) interface
Browse files Browse the repository at this point in the history
Add an interface for the phy_speed_(up|down) functions when a driver
makes use of phylink. These pass the call through to phylib when we
have a normal PHY attached (i.o.w., not a PHY on a SFP module.)

Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Russell King authored and David S. Miller committed Jun 25, 2020
1 parent 4b88b9c commit c6d5d84
Show file tree
Hide file tree
Showing 2 changed files with 50 additions and 0 deletions.
48 changes: 48 additions & 0 deletions drivers/net/phy/phylink.c
Original file line number Diff line number Diff line change
Expand Up @@ -1826,6 +1826,54 @@ int phylink_mii_ioctl(struct phylink *pl, struct ifreq *ifr, int cmd)
}
EXPORT_SYMBOL_GPL(phylink_mii_ioctl);

/**
* phylink_speed_down() - set the non-SFP PHY to lowest speed supported by both
* link partners
* @pl: a pointer to a &struct phylink returned from phylink_create()
* @sync: perform action synchronously
*
* If we have a PHY that is not part of a SFP module, then set the speed
* as described in the phy_speed_down() function. Please see this function
* for a description of the @sync parameter.
*
* Returns zero if there is no PHY, otherwise as per phy_speed_down().
*/
int phylink_speed_down(struct phylink *pl, bool sync)
{
int ret = 0;

ASSERT_RTNL();

if (!pl->sfp_bus && pl->phydev)
ret = phy_speed_down(pl->phydev, sync);

return ret;
}
EXPORT_SYMBOL_GPL(phylink_speed_down);

/**
* phylink_speed_up() - restore the advertised speeds prior to the call to
* phylink_speed_down()
* @pl: a pointer to a &struct phylink returned from phylink_create()
*
* If we have a PHY that is not part of a SFP module, then restore the
* PHY speeds as per phy_speed_up().
*
* Returns zero if there is no PHY, otherwise as per phy_speed_up().
*/
int phylink_speed_up(struct phylink *pl)
{
int ret = 0;

ASSERT_RTNL();

if (!pl->sfp_bus && pl->phydev)
ret = phy_speed_up(pl->phydev);

return ret;
}
EXPORT_SYMBOL_GPL(phylink_speed_up);

static void phylink_sfp_attach(void *upstream, struct sfp_bus *bus)
{
struct phylink *pl = upstream;
Expand Down
2 changes: 2 additions & 0 deletions include/linux/phylink.h
Original file line number Diff line number Diff line change
Expand Up @@ -392,6 +392,8 @@ int phylink_init_eee(struct phylink *, bool);
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_speed_down(struct phylink *pl, bool sync);
int phylink_speed_up(struct phylink *pl);

#define phylink_zero(bm) \
bitmap_zero(bm, __ETHTOOL_LINK_MODE_MASK_NBITS)
Expand Down

0 comments on commit c6d5d84

Please sign in to comment.