| Message ID | 20231129132521.net.v3.3.Ib839d9adc704a04f99743f070d6c8e39dec6a1aa@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 8a67b47fced9f6a84101eb9ec5ce4c7d64204bc7 |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | [net,v3,1/5] r8152: Hold the rtnl_lock for all of reset | expand |
Douglas Anderson <dianders@chromium.org> > Sent: Thursday, November 30, 2023 5:25 AM [...] > > Delay loops in r8152 should break out if RTL8152_INACCESSIBLE is set > so that they don't delay too long if the device becomes > inaccessible. Add the break to the loop in > r8156b_wait_loading_flash(). > > Fixes: 195aae321c82 ("r8152: support new chips") > Reviewed-by: Grant Grundler <grundler@chromium.org> > Signed-off-by: Douglas Anderson <dianders@chromium.org> Acked-by: Hayes Wang <hayeswang@realtek.com> Best Regards, Hayes
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c index e9955701f455..c4dd81e2421f 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5521,6 +5521,8 @@ static void r8156b_wait_loading_flash(struct r8152 *tp) int i; for (i = 0; i < 100; i++) { + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + break; if (ocp_read_word(tp, MCU_TYPE_USB, USB_GPHY_CTRL) & GPHY_PATCH_DONE) break; usleep_range(1000, 2000);
Delay loops in r8152 should break out if RTL8152_INACCESSIBLE is set so that they don't delay too long if the device becomes inaccessible. Add the break to the loop in r8156b_wait_loading_flash(). Fixes: 195aae321c82 ("r8152: support new chips") Reviewed-by: Grant Grundler <grundler@chromium.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- Changes in v3: - Use `break` when we see RTL8152_INACCESSIBLE, not `return`. Changes in v2: - Added Fixes tag to RTL8152_INACCESSIBLE patches. - Split RTL8152_INACCESSIBLE patches by the commit the loop came from. drivers/net/usb/r8152.c | 2 ++ 1 file changed, 2 insertions(+)