domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

realtek: clean up rtl838x MDIO busy wait loop

Browse Source 
Don't use udelay to allow other kernel tasks to execute if the kernel
has been built without preemption. Also determine the timeout based on
jiffies instead of loop iterations.

This is especially important on devices containing a watchdog with a
short timeout. Without this change, the watchdog is not serviced during
PHY patching which can take multiple seconds.

Tested-by: Birger Koblitz <mail@birger-koblitz.de>
Signed-off-by: Jan Hoffmann <jan@3e8.eu>
This commit is contained in:
Jan Hoffmann
2022-07-23 22:53:16 +02:00
committed by Daniel Golle
parent b6a0d50b7f
commit 81e3017609
1 changed files with 22 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
target/linux/realtek/files-5.10/drivers/net/dsa/rtl83xx/rtl838x.c
View File

@@ -1805,13 +1805,20 @@ irqreturn_t rtl838x_switch_irq(int irq, void *dev_id)
int rtl838x_smi_wait_op(int timeout) int rtl838x_smi_wait_op(int timeout)
{ {
do { unsigned long end = jiffies + usecs_to_jiffies(timeout);
timeout--;
udelay(10); while (1) {
} while ((sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_1) & 0x1) && (timeout >= 0)); if (!(sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_1) & 0x1))
if (timeout <= 0)
return -1;
return 0; return 0;
if (time_after(jiffies, end))
break;
usleep_range(10, 20);
}
pr_err("rtl838x_smi_wait_op: timeout\n");
return -1;
} }
/* /*
@@ -1832,7 +1839,7 @@ int rtl838x_read_phy(u32 port, u32 page, u32 reg, u32 *val)
mutex_lock(&smi_lock); mutex_lock(&smi_lock);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
sw_w32_mask(0xffff0000, port << 16, RTL838X_SMI_ACCESS_PHY_CTRL_2); sw_w32_mask(0xffff0000, port << 16, RTL838X_SMI_ACCESS_PHY_CTRL_2);
@@ -1842,7 +1849,7 @@ int rtl838x_read_phy(u32 port, u32 page, u32 reg, u32 *val)
sw_w32(v | park_page, RTL838X_SMI_ACCESS_PHY_CTRL_1); sw_w32(v | park_page, RTL838X_SMI_ACCESS_PHY_CTRL_1);
sw_w32_mask(0, 1, RTL838X_SMI_ACCESS_PHY_CTRL_1); sw_w32_mask(0, 1, RTL838X_SMI_ACCESS_PHY_CTRL_1);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
*val = sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_2) & 0xffff; *val = sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_2) & 0xffff;
@@ -1868,7 +1875,7 @@ int rtl838x_write_phy(u32 port, u32 page, u32 reg, u32 val)
return -ENOTSUPP; return -ENOTSUPP;
mutex_lock(&smi_lock); mutex_lock(&smi_lock);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
sw_w32(BIT(port), RTL838X_SMI_ACCESS_PHY_CTRL_0); sw_w32(BIT(port), RTL838X_SMI_ACCESS_PHY_CTRL_0);
@@ -1881,7 +1888,7 @@ int rtl838x_write_phy(u32 port, u32 page, u32 reg, u32 val)
sw_w32(v | park_page, RTL838X_SMI_ACCESS_PHY_CTRL_1); sw_w32(v | park_page, RTL838X_SMI_ACCESS_PHY_CTRL_1);
sw_w32_mask(0, 1, RTL838X_SMI_ACCESS_PHY_CTRL_1); sw_w32_mask(0, 1, RTL838X_SMI_ACCESS_PHY_CTRL_1);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
mutex_unlock(&smi_lock); mutex_unlock(&smi_lock);
@@ -1901,7 +1908,7 @@ int rtl838x_read_mmd_phy(u32 port, u32 addr, u32 reg, u32 *val)
mutex_lock(&smi_lock); mutex_lock(&smi_lock);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
sw_w32(1 << port, RTL838X_SMI_ACCESS_PHY_CTRL_0); sw_w32(1 << port, RTL838X_SMI_ACCESS_PHY_CTRL_0);
@@ -1916,7 +1923,7 @@ int rtl838x_read_mmd_phy(u32 port, u32 addr, u32 reg, u32 *val)
v = 1 << 1 | 0 << 2 | 1; v = 1 << 1 | 0 << 2 | 1;
sw_w32(v, RTL838X_SMI_ACCESS_PHY_CTRL_1); sw_w32(v, RTL838X_SMI_ACCESS_PHY_CTRL_1);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
*val = sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_2) & 0xffff; *val = sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_2) & 0xffff;
@@ -1940,7 +1947,7 @@ int rtl838x_write_mmd_phy(u32 port, u32 addr, u32 reg, u32 val)
val &= 0xffff; val &= 0xffff;
mutex_lock(&smi_lock); mutex_lock(&smi_lock);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
sw_w32(1 << port, RTL838X_SMI_ACCESS_PHY_CTRL_0); sw_w32(1 << port, RTL838X_SMI_ACCESS_PHY_CTRL_0);
@@ -1954,7 +1961,7 @@ int rtl838x_write_mmd_phy(u32 port, u32 addr, u32 reg, u32 val)
v = 1 << 1 | 1 << 2 | 1; v = 1 << 1 | 1 << 2 | 1;
sw_w32(v, RTL838X_SMI_ACCESS_PHY_CTRL_1); sw_w32(v, RTL838X_SMI_ACCESS_PHY_CTRL_1);
if (rtl838x_smi_wait_op(10000)) if (rtl838x_smi_wait_op(100000))
goto timeout; goto timeout;
mutex_unlock(&smi_lock); mutex_unlock(&smi_lock);