From: Douglas Anderson <dianders@chromium.org>
Date: Wed, 29 Nov 2023 21:25:22 +0000 (-0800)
Subject: r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash()
X-Git-Tag: v5.15.143~117
X-Git-Url: http://git.ipfire.org/gitweb.cgi?a=commitdiff_plain;h=0a53ed0b00682cebb04baf41272b5d1ff2898f79;p=thirdparty%2Fkernel%2Fstable.git

r8152: Add RTL8152_INACCESSIBLE to r8156b_wait_loading_flash()

[ Upstream commit 8a67b47fced9f6a84101eb9ec5ce4c7d64204bc7 ]

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>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---

diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index 1bb304857a744..c4a3076bb2261 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -5396,6 +5396,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);