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

Commit 797ac071 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: phy: move PHY software reset to genphy_soft_reset 



As pointed out by Shaohui, this function is generic for 10/100/1000
PHYs, but 10G PHYs might have a slightly different reset sequence which
prevents most of them from using this function.

Move the BMCR_RESET based software resent sequence to
genphy_soft_reset() in preparation for allowing PHY drivers to implement
a soft_reset() callback.

Reported-by: default avatarShaohui Xie <Shaohui.Xie@freescale.com>
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent ee0c4c39

drivers/net/phy/phy_device.c

+22 −5
Original line number Diff line number Diff line
@@ -540,11 +540,7 @@ int phy_init_hw(struct phy_device *phydev) 
	if (!phydev->drv || !phydev->drv->config_init)

		return 0;



	ret = phy_write(phydev, MII_BMCR, BMCR_RESET);

	if (ret < 0)

		return ret;



	ret = phy_poll_reset(phydev);

	ret = genphy_soft_reset(phydev);

	if (ret < 0)

		return ret;
@@ -1045,6 +1041,27 @@ static int gen10g_read_status(struct phy_device *phydev) 
	return 0;

}



/**

 * genphy_soft_reset - software reset the PHY via BMCR_RESET bit

 * @phydev: target phy_device struct

 *

 * Description: Perform a software PHY reset using the standard

 * BMCR_RESET bit and poll for the reset bit to be cleared.

 *

 * Returns: 0 on success, < 0 on failure

 */

int genphy_soft_reset(struct phy_device *phydev)

{

	int ret;



	ret = phy_write(phydev, MII_BMCR, BMCR_RESET);

	if (ret < 0)

		return ret;



	return phy_poll_reset(phydev);

}

EXPORT_SYMBOL(genphy_soft_reset);



static int genphy_config_init(struct phy_device *phydev)

{

	int val;

include/linux/phy.h

+1 −0
Original line number Diff line number Diff line
@@ -666,6 +666,7 @@ int genphy_update_link(struct phy_device *phydev); 
int genphy_read_status(struct phy_device *phydev);

int genphy_suspend(struct phy_device *phydev);

int genphy_resume(struct phy_device *phydev);

int genphy_soft_reset(struct phy_device *phydev);

void phy_driver_unregister(struct phy_driver *drv);

void phy_drivers_unregister(struct phy_driver *drv, int n);

int phy_driver_register(struct phy_driver *new_driver);