Commit ad3df637 authored by David S. Miller's avatar David S. Miller
Browse files

Merge branch 'net-phy-realtek-move-PHY-resume-delay-from-MAC-to-PHY-driver' 



Heiner Kallweit says:

====================
net: phy: realtek: move PHY resume delay from MAC to PHY driver

Internal PHY's from RTL8168h up may not be instantly ready after calling
genphy_resume(). So far r8169 network driver adds the needed delay, but
better handle this in the PHY driver. The network driver may miss other
places where the PHY is resumed.
====================

Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parents 6d927977 109f0cf2

drivers/net/ethernet/realtek/r8169_main.c

+0 −2
Original line number Diff line number Diff line
@@ -2391,8 +2391,6 @@ static void rtl_pll_power_up(struct rtl8169_private *tp) 
	}



	phy_resume(tp->phydev);

	/* give MAC/PHY some time to resume */

	msleep(20);

}



static void rtl_init_rxcfg(struct rtl8169_private *tp)

drivers/net/phy/realtek.c

+13 −2
Original line number Diff line number Diff line
@@ -11,6 +11,7 @@ 
#include <linux/bitops.h>

#include <linux/phy.h>

#include <linux/module.h>

#include <linux/delay.h>



#define RTL821x_PHYSR				0x11

#define RTL821x_PHYSR_DUPLEX			BIT(13)
@@ -526,6 +527,16 @@ static int rtl8125_match_phy_device(struct phy_device *phydev) 
	       rtlgen_supports_2_5gbps(phydev);

}



static int rtlgen_resume(struct phy_device *phydev)

{

	int ret = genphy_resume(phydev);



	/* Internal PHY's from RTL8168h up may not be instantly ready */

	msleep(20);



	return ret;

}



static struct phy_driver realtek_drvs[] = {

	{

		PHY_ID_MATCH_EXACT(0x00008201),
@@ -609,7 +620,7 @@ static struct phy_driver realtek_drvs[] = { 
		.match_phy_device = rtlgen_match_phy_device,

		.read_status	= rtlgen_read_status,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.resume		= rtlgen_resume,

		.read_page	= rtl821x_read_page,

		.write_page	= rtl821x_write_page,

		.read_mmd	= rtlgen_read_mmd,
@@ -621,7 +632,7 @@ static struct phy_driver realtek_drvs[] = { 
		.config_aneg	= rtl8125_config_aneg,

		.read_status	= rtl8125_read_status,

		.suspend	= genphy_suspend,

		.resume		= genphy_resume,

		.resume		= rtlgen_resume,

		.read_page	= rtl821x_read_page,

		.write_page	= rtl821x_write_page,

		.read_mmd	= rtl8125_read_mmd,

CRA Git | Maintained and supported by SUSTech CRA and CCSE