shinys000114/linux
1
0
Fork 0
mirror of https://github.com/hardkernel/linux.git synced 2026-06-05 18:41:58 +09:00
Code Issues Packages Projects Releases Wiki Activity

net: phy: mxl-gpy: enhance delay time required by loopback disable function

Browse Source 
[ Upstream commit 0ba13995be ]

GPY2xx devices need 3 seconds to fully switch out of loopback mode
before it can safely re-enter loopback mode. Implement timeout mechanism
to guarantee 3 seconds waited before re-enter loopback mode.

Signed-off-by: Xu Liang <lxu@maxlinear.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: c44d3ffd85db ("net: phy: mxl-gpy: Remove interrupt mask clearing from config_init")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Xu Liang
2023-03-15 00:30:23 +08:00
committed by Greg Kroah-Hartman
parent 7d0606bdd7
commit 70993aca4f
1 changed files with 31 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

39
drivers/net/phy/mxl-gpy.c
View File

@@ -95,6 +95,13 @@ struct gpy_priv {
u8 fw_major; u8 fw_major;
u8 fw_minor; u8 fw_minor;
/* It takes 3 seconds to fully switch out of loopback mode before
* it can safely re-enter loopback mode. Record the time when
* loopback is disabled. Check and wait if necessary before loopback
* is enabled.
*/
u64 lb_dis_to;
}; };
static const struct { static const struct {
@@ -682,18 +689,34 @@ static void gpy_get_wol(struct phy_device *phydev,
static int gpy_loopback(struct phy_device *phydev, bool enable) static int gpy_loopback(struct phy_device *phydev, bool enable)
{ {
struct gpy_priv *priv = phydev->priv;
u16 set = 0;
int ret; int ret;
ret = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, if (enable) {
enable ? BMCR_LOOPBACK : 0); u64 now = get_jiffies_64();
if (!ret) {
/* It takes some time for PHY device to switch /* wait until 3 seconds from last disable */
* into/out-of loopback mode. if (time_before64(now, priv->lb_dis_to))
*/ msleep(jiffies64_to_msecs(priv->lb_dis_to - now));
msleep(100);
set = BMCR_LOOPBACK;
} }
return ret; ret = phy_modify(phydev, MII_BMCR, BMCR_LOOPBACK, set);
if (ret <= 0)
return ret;
if (enable) {
/* It takes some time for PHY device to switch into
* loopback mode.
*/
msleep(100);
} else {
priv->lb_dis_to = get_jiffies_64() + HZ * 3;
}
return 0;
} }
static int gpy115_loopback(struct phy_device *phydev, bool enable) static int gpy115_loopback(struct phy_device *phydev, bool enable)