Commit fee698d6 authored by Heiner Kallweit's avatar Heiner Kallweit Committed by David S. Miller

net: phy: realtek: add delay to resume path of certain internal PHY's

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 avatarHeiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 6d927977
...@@ -11,6 +11,7 @@ ...@@ -11,6 +11,7 @@
#include <linux/bitops.h> #include <linux/bitops.h>
#include <linux/phy.h> #include <linux/phy.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/delay.h>
#define RTL821x_PHYSR 0x11 #define RTL821x_PHYSR 0x11
#define RTL821x_PHYSR_DUPLEX BIT(13) #define RTL821x_PHYSR_DUPLEX BIT(13)
...@@ -526,6 +527,16 @@ static int rtl8125_match_phy_device(struct phy_device *phydev) ...@@ -526,6 +527,16 @@ static int rtl8125_match_phy_device(struct phy_device *phydev)
rtlgen_supports_2_5gbps(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[] = { static struct phy_driver realtek_drvs[] = {
{ {
PHY_ID_MATCH_EXACT(0x00008201), PHY_ID_MATCH_EXACT(0x00008201),
...@@ -609,7 +620,7 @@ static struct phy_driver realtek_drvs[] = { ...@@ -609,7 +620,7 @@ static struct phy_driver realtek_drvs[] = {
.match_phy_device = rtlgen_match_phy_device, .match_phy_device = rtlgen_match_phy_device,
.read_status = rtlgen_read_status, .read_status = rtlgen_read_status,
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = rtlgen_resume,
.read_page = rtl821x_read_page, .read_page = rtl821x_read_page,
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
.read_mmd = rtlgen_read_mmd, .read_mmd = rtlgen_read_mmd,
...@@ -621,7 +632,7 @@ static struct phy_driver realtek_drvs[] = { ...@@ -621,7 +632,7 @@ static struct phy_driver realtek_drvs[] = {
.config_aneg = rtl8125_config_aneg, .config_aneg = rtl8125_config_aneg,
.read_status = rtl8125_read_status, .read_status = rtl8125_read_status,
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = rtlgen_resume,
.read_page = rtl821x_read_page, .read_page = rtl821x_read_page,
.write_page = rtl821x_write_page, .write_page = rtl821x_write_page,
.read_mmd = rtl8125_read_mmd, .read_mmd = rtl8125_read_mmd,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment