Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 002ba705 authored by Russell King's avatar Russell King Committed by David S. Miller
Browse files

net: phy: hook up clause 45 autonegotiation restart 



genphy_restart_aneg() can only restart autonegotiation on clause 22
PHYs.  Add a phy_restart_aneg() function which selects between the
clause 22 and clause 45 restart functionality depending on the PHY
type and whether the Clause 45 PHY supports the Clause 22 register set.

Signed-off-by: default avatarRussell King <rmk+kernel@armlinux.org.uk>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 41408ad5

drivers/net/phy/phy.c

+21 −2
Original line number Original line Diff line number Diff line
@@ -149,6 +149,25 @@ static int phy_config_interrupt(struct phy_device *phydev, u32 interrupts) 
	return 0;

	return 0;

}

}





/**

 * phy_restart_aneg - restart auto-negotiation

 * @phydev: target phy_device struct

 *

 * Restart the autonegotiation on @phydev.  Returns >= 0 on success or

 * negative errno on error.

 */

int phy_restart_aneg(struct phy_device *phydev)

{

	int ret;



	if (phydev->is_c45 && !(phydev->c45_ids.devices_in_package & BIT(0)))

		ret = genphy_c45_restart_aneg(phydev);

	else

		ret = genphy_restart_aneg(phydev);



	return ret;

}

EXPORT_SYMBOL_GPL(phy_restart_aneg);





/**

/**

 * phy_aneg_done - return auto-negotiation status

 * phy_aneg_done - return auto-negotiation status
@@ -1397,7 +1416,7 @@ int phy_ethtool_set_eee(struct phy_device *phydev, struct ethtool_eee *data) 
		/* Restart autonegotiation so the new modes get sent to the

		/* Restart autonegotiation so the new modes get sent to the

		 * link partner.

		 * link partner.

		 */

		 */

		ret = genphy_restart_aneg(phydev);

		ret = phy_restart_aneg(phydev);

		if (ret < 0)

		if (ret < 0)

			return ret;

			return ret;

	}

	}
@@ -1456,6 +1475,6 @@ int phy_ethtool_nway_reset(struct net_device *ndev) 
	if (!phydev->drv)

	if (!phydev->drv)

		return -EIO;

		return -EIO;





	return genphy_restart_aneg(phydev);

	return phy_restart_aneg(phydev);

}

}

EXPORT_SYMBOL(phy_ethtool_nway_reset);
 
EXPORT_SYMBOL(phy_ethtool_nway_reset);

include/linux/phy.h

+1 −0
Original line number Original line Diff line number Diff line
@@ -804,6 +804,7 @@ int phy_start_aneg(struct phy_device *phydev); 
int phy_aneg_done(struct phy_device *phydev);

int phy_aneg_done(struct phy_device *phydev);





int phy_stop_interrupts(struct phy_device *phydev);

int phy_stop_interrupts(struct phy_device *phydev);

int phy_restart_aneg(struct phy_device *phydev);





static inline int phy_read_status(struct phy_device *phydev)

static inline int phy_read_status(struct phy_device *phydev)

{

{