Commit 9e8ccd89 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-phy-add-and-use-genphy_c45_an_config_an' 



Heiner Kallweit says:

====================
net: phy: add and use genphy_c45_an_config_an

This series adds genphy_c45_an_config_an() and uses it in the
marvell10g diver. In addition patch 4 aligns the aneg configuration
with what is done in genphy_config_aneg().

v2:
- in patch 2 changed function name to genphy_c45_an_config_aneg
- in patch 3 add a comment regarding 1000BaseT vendor registers

v3:
- rebase patch 3
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 885e6319 3ce2a027

drivers/net/phy/marvell10g.c

+12 −19
Original line number Diff line number Diff line
@@ -279,18 +279,15 @@ static int mv3310_config_aneg(struct phy_device *phydev) 
		return genphy_c45_an_disable_aneg(phydev);

	}



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

		     phydev->supported);



	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_ADVERTISE,

			     ADVERTISE_ALL | ADVERTISE_100BASE4 |

			     ADVERTISE_PAUSE_CAP | ADVERTISE_PAUSE_ASYM,

			     linkmode_adv_to_mii_adv_t(phydev->advertising));

	ret = genphy_c45_an_config_aneg(phydev);

	if (ret < 0)

		return ret;

	if (ret > 0)

		changed = true;



	/* Clause 45 has no standardized support for 1000BaseT, therefore

	 * use vendor registers for this mode.

	 */

	reg = linkmode_adv_to_mii_ctrl1000_t(phydev->advertising);

	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MV_AN_CTRL1000,

			     ADVERTISE_1000FULL | ADVERTISE_1000HALF, reg);
@@ -299,19 +296,15 @@ static int mv3310_config_aneg(struct phy_device *phydev) 
	if (ret > 0)

		changed = true;



	/* 10G control register */

	if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

			      phydev->advertising))

		reg = MDIO_AN_10GBT_CTRL_ADV10G;

	else

		reg = 0;



	ret = phy_modify_mmd_changed(phydev, MDIO_MMD_AN, MDIO_AN_10GBT_CTRL,

				     MDIO_AN_10GBT_CTRL_ADV10G, reg);

	if (!changed) {

		/* Configure and restart aneg if it wasn't set before */

		ret = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_CTRL1);

		if (ret < 0)

			return ret;

	if (ret > 0)

		changed = true;



		if (!(ret & MDIO_AN_CTRL1_ENABLE))

			changed = 1;

	}



	if (changed)

		ret = genphy_c45_restart_aneg(phydev);

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/mdio.h

+25 −0
Original line number Diff line number Diff line
@@ -261,6 +261,31 @@ static inline u16 ethtool_adv_to_mmd_eee_adv_t(u32 adv) 
	return reg;

}



/**

 * linkmode_adv_to_mii_10gbt_adv_t

 * @advertising: the linkmode advertisement settings

 *

 * A small helper function that translates linkmode advertisement

 * settings to phy autonegotiation advertisements for the C45

 * 10GBASE-T AN CONTROL (7.32) register.

 */

static inline u32 linkmode_adv_to_mii_10gbt_adv_t(unsigned long *advertising)

{

	u32 result = 0;



	if (linkmode_test_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,

			      advertising))

		result |= MDIO_AN_10GBT_CTRL_ADV2_5G;

	if (linkmode_test_bit(ETHTOOL_LINK_MODE_5000baseT_Full_BIT,

			      advertising))

		result |= MDIO_AN_10GBT_CTRL_ADV5G;

	if (linkmode_test_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

			      advertising))

		result |= MDIO_AN_10GBT_CTRL_ADV10G;



	return result;

}



int __mdiobus_read(struct mii_bus *bus, int addr, u32 regnum);

int __mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val);

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