Commit 9a5dc8af authored by Andrew Lunn's avatar Andrew Lunn Committed by David S. Miller
Browse files

net: phy: add genphy_c45_an_config_aneg 



C45 configuration of 10/100 and multi-giga bit auto negotiation
advertisement is standardized. Configuration of 1000Base-T however
appears to be vendor specific. Move the generic code out of the
Marvell driver into the common phy-c45.c file.

v2:
- change function name to genphy_c45_an_config_aneg

Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
[hkallweit1@gmail.com: use new helper linkmode_adv_to_mii_10gbt_adv_t and split patch]
Signed-off-by: default avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 744e458a

drivers/net/phy/phy-c45.c

+44 −0
Original line number Diff line number Diff line
@@ -74,6 +74,50 @@ int genphy_c45_pma_setup_forced(struct phy_device *phydev) 
}

EXPORT_SYMBOL_GPL(genphy_c45_pma_setup_forced);



/**

 * genphy_c45_an_config_aneg - configure advertisement registers

 * @phydev: target phy_device struct

 *

 * Configure advertisement registers based on modes set in phydev->advertising

 *

 * Returns negative errno code on failure, 0 if advertisement didn't change,

 * or 1 if advertised modes changed.

 */

int genphy_c45_an_config_aneg(struct phy_device *phydev)

{

	int changed = 0, ret;

	u32 adv;



	linkmode_and(phydev->advertising, phydev->advertising,

		     phydev->supported);



	adv = linkmode_adv_to_mii_adv_t(phydev->advertising);



	ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE,

			     ADVERTISE_ALL | ADVERTISE_100BASE4 |

			     ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,

			     adv);

	if (ret < 0)

		return ret;

	if (ret > 0)

		changed = 1;



	adv = linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising);



	ret = phy_modify_mmd(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,

			     MDIO_AN_10GBT_CTRL_ADV10G |

			     MDIO_AN_10GBT_CTRL_ADV5G |

			     MDIO_AN_10GBT_CTRL_ADV2_5G,

			     adv);

	if (ret < 0)

		return ret;

	if (ret > 0)

		changed = 1;



	return changed;

}

EXPORT_SYMBOL_GPL(genphy_c45_an_config_aneg);



/**

 * genphy_c45_an_disable_aneg - disable auto-negotiation

 * @phydev: target phy_device struct

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -1101,6 +1101,7 @@ int genphy_c45_read_link(struct phy_device *phydev); 
int genphy_c45_read_lpa(struct phy_device *phydev);

int genphy_c45_read_pma(struct phy_device *phydev);

int genphy_c45_pma_setup_forced(struct phy_device *phydev);

int genphy_c45_an_config_aneg(struct phy_device *phydev);

int genphy_c45_an_disable_aneg(struct phy_device *phydev);

int genphy_c45_read_mdix(struct phy_device *phydev);

int genphy_c45_pma_read_abilities(struct phy_device *phydev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE