Commit 1c86828d authored by Russell King (Oracle)'s avatar Russell King (Oracle) Committed by Jakub Kicinski
Browse files

net: phy: marvell: implement phy_inband_caps() method 



Provide an implementation for phy_inband_caps() for Marvell PHYs used
on SFP modules, so that phylink knows the PHYs capabilities.

Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarRussell King (Oracle) <rmk+kernel@armlinux.org.uk>
Link: https://patch.msgid.link/E1tIUro-006IUC-Rq@rmk-PC.armlinux.org.uk


Signed-off-by: default avatarJakub Kicinski <kuba@kernel.org>
parent c64c7fa0

drivers/net/phy/marvell.c

+17 −0
Original line number Diff line number Diff line
@@ -717,6 +717,20 @@ static int marvell_config_aneg_fiber(struct phy_device *phydev) 
	return genphy_check_and_restart_aneg(phydev, changed);

}



static unsigned int m88e1111_inband_caps(struct phy_device *phydev,

					 phy_interface_t interface)

{

	/* In 1000base-X and SGMII modes, the inband mode can be changed

	 * through the Fibre page BMCR ANENABLE bit.

	 */

	if (interface == PHY_INTERFACE_MODE_1000BASEX ||

	    interface == PHY_INTERFACE_MODE_SGMII)

		return LINK_INBAND_DISABLE | LINK_INBAND_ENABLE |

		       LINK_INBAND_BYPASS;



	return 0;

}



static int m88e1111_config_aneg(struct phy_device *phydev)

{

	int extsr = phy_read(phydev, MII_M1111_PHY_EXT_SR);
@@ -3677,6 +3691,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1112",

		/* PHY_GBIT_FEATURES */

		.probe = marvell_probe,

		.inband_caps = m88e1111_inband_caps,

		.config_init = m88e1112_config_init,

		.config_aneg = marvell_config_aneg,

		.config_intr = marvell_config_intr,
@@ -3698,6 +3713,7 @@ static struct phy_driver marvell_drivers[] = { 
		/* PHY_GBIT_FEATURES */

		.flags = PHY_POLL_CABLE_TEST,

		.probe = marvell_probe,

		.inband_caps = m88e1111_inband_caps,

		.config_init = m88e1111gbe_config_init,

		.config_aneg = m88e1111_config_aneg,

		.read_status = marvell_read_status,
@@ -3721,6 +3737,7 @@ static struct phy_driver marvell_drivers[] = { 
		.name = "Marvell 88E1111 (Finisar)",

		/* PHY_GBIT_FEATURES */

		.probe = marvell_probe,

		.inband_caps = m88e1111_inband_caps,

		.config_init = m88e1111gbe_config_init,

		.config_aneg = m88e1111_config_aneg,

		.read_status = marvell_read_status,