UbiquitousOS
/
OpenCloudOS-Kernel
mirror of https://gitee.com/OpenCloudOS/OpenCloudOS-Kernel.git
11
0
Fork 0
Code Issues Projects Releases Wiki Activity

net: phylink: change phylink_mii_c22_pcs_set_advertisement() prototype 

Change phylink_mii_c22_pcs_set_advertisement() to take only the PHY
interface and advertisement mask, rather than the full phylink state.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2020-03-30 18:44:44 +01:00 committed by David S. Miller
parent b8447abc4c
commit 0bd274060a
2 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
drivers/net/phy/phylink.c
View File

@ -2184,7 +2184,8 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
* phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS * phylink_mii_c22_pcs_set_advertisement() - configure the clause 37 PCS
* advertisement * advertisement
* @pcs: a pointer to a &struct mdio_device. * @pcs: a pointer to a &struct mdio_device.
* @state: a pointer to the state being configured. * @interface: the PHY interface mode being configured
* @advertising: the ethtool advertisement mask
* *
* Helper for MAC PCS supporting the 802.3 clause 22 register set for * Helper for MAC PCS supporting the 802.3 clause 22 register set for
* clause 37 negotiation and/or SGMII control. * clause 37 negotiation and/or SGMII control.
@ -2197,22 +2198,23 @@ EXPORT_SYMBOL_GPL(phylink_mii_c22_pcs_get_state);
* zero if no change has been made, or one if the advertisement has changed. * zero if no change has been made, or one if the advertisement has changed.
*/ */
int phylink_mii_c22_pcs_set_advertisement(struct mdio_device *pcs, int phylink_mii_c22_pcs_set_advertisement(struct mdio_device *pcs,
const struct phylink_link_state *state) phy_interface_t interface,
const unsigned long *advertising)
{ {
struct mii_bus *bus = pcs->bus; struct mii_bus *bus = pcs->bus;
int addr = pcs->addr; int addr = pcs->addr;
int val, ret; int val, ret;
u16 adv; u16 adv;
switch (state->interface) { switch (interface) {
case PHY_INTERFACE_MODE_1000BASEX: case PHY_INTERFACE_MODE_1000BASEX:
case PHY_INTERFACE_MODE_2500BASEX: case PHY_INTERFACE_MODE_2500BASEX:
adv = ADVERTISE_1000XFULL; adv = ADVERTISE_1000XFULL;
if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT, if (linkmode_test_bit(ETHTOOL_LINK_MODE_Pause_BIT,
state->advertising)) advertising))
adv |= ADVERTISE_1000XPAUSE; adv |= ADVERTISE_1000XPAUSE;
if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, if (linkmode_test_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT,
state->advertising)) advertising))
adv |= ADVERTISE_1000XPSE_ASYM; adv |= ADVERTISE_1000XPSE_ASYM;
val = mdiobus_read(bus, addr, MII_ADVERTISE); val = mdiobus_read(bus, addr, MII_ADVERTISE);

3
include/linux/phylink.h
View File

@ -320,7 +320,8 @@ void phylink_helper_basex_speed(struct phylink_link_state *state);
void phylink_mii_c22_pcs_get_state(struct mdio_device *pcs, void phylink_mii_c22_pcs_get_state(struct mdio_device *pcs,
struct phylink_link_state *state); struct phylink_link_state *state);
int phylink_mii_c22_pcs_set_advertisement(struct mdio_device *pcs, int phylink_mii_c22_pcs_set_advertisement(struct mdio_device *pcs,
const struct phylink_link_state *state); phy_interface_t interface,
const unsigned long *advertising);
void phylink_mii_c22_pcs_an_restart(struct mdio_device *pcs); void phylink_mii_c22_pcs_an_restart(struct mdio_device *pcs);
void phylink_mii_c45_pcs_get_state(struct mdio_device *pcs, void phylink_mii_c45_pcs_get_state(struct mdio_device *pcs,