Commit eba2e4c2 authored by Stefan Eichenberger's avatar Stefan Eichenberger Committed by Paolo Abeni
Browse files

net: phy: c45: add a separate function to read BASE-T1 abilities 



Add a separate function to read the BASE-T1 abilities. Some PHYs do not
indicate the availability of the extended BASE-T1 ability register, so
this function must be called separately.

Signed-off-by: default avatarStefan Eichenberger <eichest@gmail.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarPaolo Abeni <pabeni@redhat.com>
parent 25108a83

drivers/net/phy/phy-c45.c

+31 −13
Original line number Diff line number Diff line
@@ -881,6 +881,36 @@ int genphy_c45_an_config_eee_aneg(struct phy_device *phydev) 
	return genphy_c45_write_eee_adv(phydev, phydev->advertising_eee);

}



/**

 * genphy_c45_pma_baset1_read_abilities - read supported baset1 link modes from PMA

 * @phydev: target phy_device struct

 *

 * Read the supported link modes from the extended BASE-T1 ability register

 */

int genphy_c45_pma_baset1_read_abilities(struct phy_device *phydev)

{

	int val;



	val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_PMD_BT1);

	if (val < 0)

		return val;



	linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT1L_Full_BIT,

			 phydev->supported,

			 val & MDIO_PMA_PMD_BT1_B10L_ABLE);



	val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_T1_STAT);

	if (val < 0)

		return val;



	linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

			 phydev->supported,

			 val & MDIO_AN_STAT1_ABLE);



	return 0;

}

EXPORT_SYMBOL_GPL(genphy_c45_pma_baset1_read_abilities);



/**

 * genphy_c45_pma_read_abilities - read supported link modes from PMA

 * @phydev: target phy_device struct
@@ -977,21 +1007,9 @@ int genphy_c45_pma_read_abilities(struct phy_device *phydev) 
		}



		if (val & MDIO_PMA_EXTABLE_BT1) {

			val = phy_read_mmd(phydev, MDIO_MMD_PMAPMD, MDIO_PMA_PMD_BT1);

			val = genphy_c45_pma_baset1_read_abilities(phydev);

			if (val < 0)

				return val;



			linkmode_mod_bit(ETHTOOL_LINK_MODE_10baseT1L_Full_BIT,

					 phydev->supported,

					 val & MDIO_PMA_PMD_BT1_B10L_ABLE);



			val = phy_read_mmd(phydev, MDIO_MMD_AN, MDIO_AN_T1_STAT);

			if (val < 0)

				return val;



			linkmode_mod_bit(ETHTOOL_LINK_MODE_Autoneg_BIT,

					 phydev->supported,

					 val & MDIO_AN_STAT1_ABLE);

		}

	}

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -1826,6 +1826,7 @@ 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);

int genphy_c45_pma_baset1_read_abilities(struct phy_device *phydev);

int genphy_c45_read_eee_abilities(struct phy_device *phydev);

int genphy_c45_pma_baset1_read_master_slave(struct phy_device *phydev);

int genphy_c45_read_status(struct phy_device *phydev);