Commit ac3f5533 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: phy: Extract genphy_c45_pma_read_abilities from marvell10g 



Marvell 10G PHY driver has a generic way of initializing the supported
link modes by reading the PHY's C45 PMA abilities. This can be made
generic, since these registers are part of the 802.3 specifications.

This commit extracts the config_init link_mode initialization code from
marvell10g and uses it to introduce the genphy_c45_pma_read_abilities
function.

Only PMA modes are read, it's still up to the caller to set the Pause
parameters.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 3feb9b23

drivers/net/phy/marvell10g.c

+8 −70
Original line number Diff line number Diff line
@@ -233,8 +233,7 @@ static int mv3310_resume(struct phy_device *phydev) 


static int mv3310_config_init(struct phy_device *phydev)

{

	__ETHTOOL_DECLARE_LINK_MODE_MASK(supported) = { 0, };

	int val;

	int ret, val;



	/* Check that the PHY interface type is compatible */

	if (phydev->interface != PHY_INTERFACE_MODE_SGMII &&
@@ -243,8 +242,8 @@ static int mv3310_config_init(struct phy_device *phydev) 
	    phydev->interface != PHY_INTERFACE_MODE_10GKR)

		return -ENODEV;



	__set_bit(ETHTOOL_LINK_MODE_Pause_BIT, supported);

	__set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, supported);

	__set_bit(ETHTOOL_LINK_MODE_Pause_BIT, phydev->supported);

	__set_bit(ETHTOOL_LINK_MODE_Asym_Pause_BIT, phydev->supported);



	if (phydev->c45_ids.devices_in_package & MDIO_DEVS_AN) {

		val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_STAT1);
@@ -252,74 +251,13 @@ static int mv3310_config_init(struct phy_device *phydev) 
			return val;



		if (val & MDIO_AN_STAT1_ABLE)

			__set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT, supported);

	}



	val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_STAT2);

	if (val < 0)

		return val;



	/* Ethtool does not support the WAN mode bits */

	if (val & (MDIO_PMA_STAT2_10GBSR | MDIO_PMA_STAT2_10GBLR |

		   MDIO_PMA_STAT2_10GBER | MDIO_PMA_STAT2_10GBLX4 |

		   MDIO_PMA_STAT2_10GBSW | MDIO_PMA_STAT2_10GBLW |

		   MDIO_PMA_STAT2_10GBEW))

		__set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, supported);

	if (val & MDIO_PMA_STAT2_10GBSR)

		__set_bit(ETHTOOL_LINK_MODE_10000baseSR_Full_BIT, supported);

	if (val & MDIO_PMA_STAT2_10GBLR)

		__set_bit(ETHTOOL_LINK_MODE_10000baseLR_Full_BIT, supported);

	if (val & MDIO_PMA_STAT2_10GBER)

		__set_bit(ETHTOOL_LINK_MODE_10000baseER_Full_BIT, supported);



	if (val & MDIO_PMA_STAT2_EXTABLE) {

		val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_EXTABLE);

		if (val < 0)

			return val;



		if (val & (MDIO_PMA_EXTABLE_10GBT | MDIO_PMA_EXTABLE_1000BT |

			   MDIO_PMA_EXTABLE_100BTX | MDIO_PMA_EXTABLE_10BT))

			__set_bit(ETHTOOL_LINK_MODE_TP_BIT, supported);

		if (val & MDIO_PMA_EXTABLE_10GBLRM)

			__set_bit(ETHTOOL_LINK_MODE_FIBRE_BIT, supported);

		if (val & (MDIO_PMA_EXTABLE_10GBKX4 | MDIO_PMA_EXTABLE_10GBKR |

			   MDIO_PMA_EXTABLE_1000BKX))

			__set_bit(ETHTOOL_LINK_MODE_Backplane_BIT, supported);

		if (val & MDIO_PMA_EXTABLE_10GBLRM)

			__set_bit(ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT,

				  supported);

		if (val & MDIO_PMA_EXTABLE_10GBT)

			__set_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

				  supported);

		if (val & MDIO_PMA_EXTABLE_10GBKX4)

			__set_bit(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT,

				  supported);

		if (val & MDIO_PMA_EXTABLE_10GBKR)

			__set_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,

				  supported);

		if (val & MDIO_PMA_EXTABLE_1000BT)

			__set_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

				  supported);

		if (val & MDIO_PMA_EXTABLE_1000BKX)

			__set_bit(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,

				  supported);

		if (val & MDIO_PMA_EXTABLE_100BTX) {

			__set_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,

				  supported);

			__set_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT,

				  supported);

		}

		if (val & MDIO_PMA_EXTABLE_10BT) {

			__set_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,

				  supported);

			__set_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,

				  supported);

		}

			__set_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

				  phydev->supported);

	}



	linkmode_copy(phydev->supported, supported);

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

		     phydev->supported);

	ret = genphy_c45_pma_read_abilities(phydev);

	if (ret)

		return ret;



	return 0;

}

drivers/net/phy/phy-c45.c

+74 −0
Original line number Diff line number Diff line
@@ -271,6 +271,80 @@ int genphy_c45_read_mdix(struct phy_device *phydev) 
}

EXPORT_SYMBOL_GPL(genphy_c45_read_mdix);



/**

 * genphy_c45_pma_read_abilities - read supported link modes from PMA

 * @phydev: target phy_device struct

 *

 * Read the supported link modes from the PMA Status 2 (1.8) register. If bit

 * 1.8.9 is set, the list of supported modes is build using the values in the

 * PMA Extended Abilities (1.11) register, indicating 1000BASET an 10G related

 * modes. If bit 1.11.14 is set, then the list is also extended with the modes

 * in the 2.5G/5G PMA Extended register (1.21), indicating if 2.5GBASET and

 * 5GBASET are supported.

 */

int genphy_c45_pma_read_abilities(struct phy_device *phydev)

{

	int val;



	val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_STAT2);

	if (val < 0)

		return val;



	linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseSR_Full_BIT,

			 phydev->supported,

			 val & MDIO_PMA_STAT2_10GBSR);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseLR_Full_BIT,

			 phydev->supported,

			 val & MDIO_PMA_STAT2_10GBLR);



	linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseER_Full_BIT,

			 phydev->supported,

			 val & MDIO_PMA_STAT2_10GBER);



	if (val & MDIO_PMA_STAT2_EXTABLE) {

		val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_EXTABLE);

		if (val < 0)

			return val;



		linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseLRM_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_10GBLRM);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseT_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_10GBT);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseKX4_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_10GBKX4);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_10000baseKR_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_10GBKR);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseT_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_1000BT);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_1000baseKX_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_1000BKX);



		linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_100BTX);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_100baseT_Half_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_100BTX);



		linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Full_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_10BT);

		linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT_Half_BIT,

				 phydev->supported,

				 val & MDIO_PMA_EXTABLE_10BT);

	}



	return 0;

}

EXPORT_SYMBOL_GPL(genphy_c45_pma_read_abilities);



/* The gen10g_* functions are the old Clause 45 stub */



int gen10g_config_aneg(struct phy_device *phydev)

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -1116,6 +1116,7 @@ int genphy_c45_read_pma(struct phy_device *phydev); 
int genphy_c45_pma_setup_forced(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);



/* The gen10g_* functions are the old Clause 45 stub */

int gen10g_config_aneg(struct phy_device *phydev);

CRA Git | Maintained and supported by SUSTech CRA and CCSE