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

realtek: Use built-in functionality for timeout loop

Browse Source 
In commit 81e3017609 ("realtek: clean up rtl838x MDIO busy wait loop")
a hand-crafted loop was created, that nearly exactly replicate the
iopoll's `read_poll_timeout` functionality.

Use that instead.

Signed-off-by: Olliver Schinagl <oliver@schinagl.nl>
This commit is contained in:
Olliver Schinagl
2022-08-31 17:20:52 +02:00
committed by Christian Marangi
parent cf2c9498be
commit 9cec4a0ea4
1 changed files with 7 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -1,6 +1,7 @@
// SPDX-License-Identifier: GPL-2.0-only // SPDX-License-Identifier: GPL-2.0-only
#include <asm/mach-rtl838x/mach-rtl83xx.h> #include <asm/mach-rtl838x/mach-rtl83xx.h>
#include <linux/iopoll.h>
#include <net/nexthop.h> #include <net/nexthop.h>
#include "rtl83xx.h" #include "rtl83xx.h"
@@ -1805,20 +1806,14 @@ irqreturn_t rtl838x_switch_irq(int irq, void *dev_id)
int rtl838x_smi_wait_op(int timeout) int rtl838x_smi_wait_op(int timeout)
{ {
unsigned long end = jiffies + usecs_to_jiffies(timeout); int ret = 0;
u32 val;
while (1) { ret = readx_poll_timeout(sw_r32, RTL838X_SMI_ACCESS_PHY_CTRL_1, val, val & 0x1, 20, timeout);
if (!(sw_r32(RTL838X_SMI_ACCESS_PHY_CTRL_1) & 0x1)) if (ret)
return 0; pr_err("%s: timeout\n", __func__);
if (time_after(jiffies, end)) return ret;
break;
usleep_range(10, 20);
}
pr_err("rtl838x_smi_wait_op: timeout\n");
return -1;
} }
/* /*