| Message ID | 20231129132521.net.v3.5.I1306b6432228404d6e61b2d43c2f71885292e972@changeid (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 79321a793945fdbff2f405f84712d0ab81bed287 |
| 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 r8153_aldps_en(). > > Fixes: 4214cc550bf9 ("r8152: check if disabling ALDPS is finished") > 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 3958eb622d47..fcdc9ba0f826 100644 --- a/drivers/net/usb/r8152.c +++ b/drivers/net/usb/r8152.c @@ -5803,6 +5803,8 @@ static void r8153_aldps_en(struct r8152 *tp, bool enable) data &= ~EN_ALDPS; ocp_reg_write(tp, OCP_POWER_CFG, data); for (i = 0; i < 20; i++) { + if (test_bit(RTL8152_INACCESSIBLE, &tp->flags)) + return; usleep_range(1000, 2000); if (ocp_read_word(tp, MCU_TYPE_PLA, 0xe000) & 0x0100) break;
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 r8153_aldps_en(). Fixes: 4214cc550bf9 ("r8152: check if disabling ALDPS is finished") Reviewed-by: Grant Grundler <grundler@chromium.org> Signed-off-by: Douglas Anderson <dianders@chromium.org> --- (no changes since v2) 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(+)