From: Douglas Anderson <dianders@chromium.org>
To: Jakub Kicinski <kuba@kernel.org>,
Hayes Wang <hayeswang@realtek.com>,
"David S . Miller" <davem@davemloft.net>
Cc: "Grant Grundler" <grundler@chromium.org>,
"Edward Hill" <ecgh@chromium.org>,
linux-usb@vger.kernel.org, "Simon Horman" <horms@kernel.org>,
"Laura Nao" <laura.nao@collabora.com>,
"Alan Stern" <stern@rowland.harvard.edu>,
"Douglas Anderson" <dianders@chromium.org>,
"Bjørn Mork" <bjorn@mork.no>,
"Eric Dumazet" <edumazet@google.com>,
"Paolo Abeni" <pabeni@redhat.com>,
linux-kernel@vger.kernel.org, netdev@vger.kernel.org
Subject: [PATCH v4 3/5] r8152: Check for unplug in r8153b_ups_en() / r8153c_ups_en()
Date: Thu, 19 Oct 2023 14:20:22 -0700 [thread overview]
Message-ID: <20231019142019.v4.3.I6405b1587446c157c6d6263957571f2b11f330a7@changeid> (raw)
In-Reply-To: <20231019212130.3146151-1-dianders@chromium.org>
If the adapter is unplugged while we're looping in r8153b_ups_en() /
r8153c_ups_en() we could end up looping for 10 seconds (20 ms * 500
loops). Add code similar to what's done in other places in the driver
to check for unplug and bail.
Signed-off-by: Douglas Anderson <dianders@chromium.org>
---
(no changes since v2)
Changes in v2:
- ("Check for unplug in r8153b_ups_en() / r8153c_ups_en()") new for v2.
drivers/net/usb/r8152.c | 4 ++++
1 file changed, 4 insertions(+)
diff --git a/drivers/net/usb/r8152.c b/drivers/net/usb/r8152.c
index fff2f9e67b5f..888d3884821e 100644
--- a/drivers/net/usb/r8152.c
+++ b/drivers/net/usb/r8152.c
@@ -3663,6 +3663,8 @@ static void r8153b_ups_en(struct r8152 *tp, bool enable)
int i;
for (i = 0; i < 500; i++) {
+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
+ return;
if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
AUTOLOAD_DONE)
break;
@@ -3703,6 +3705,8 @@ static void r8153c_ups_en(struct r8152 *tp, bool enable)
int i;
for (i = 0; i < 500; i++) {
+ if (test_bit(RTL8152_UNPLUG, &tp->flags))
+ return;
if (ocp_read_word(tp, MCU_TYPE_PLA, PLA_BOOT_CTRL) &
AUTOLOAD_DONE)
break;
--
2.42.0.758.gaed0368e0e-goog
next prev parent reply other threads:[~2023-10-19 21:23 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2023-10-19 21:20 [PATCH v4 0/5] r8152: Avoid writing garbage to the adapter's registers Douglas Anderson
2023-10-19 21:20 ` [PATCH v4 1/5] r8152: Increase USB control msg timeout to 5000ms as per spec Douglas Anderson
2023-10-19 21:20 ` [PATCH v4 2/5] r8152: Check for unplug in rtl_phy_patch_request() Douglas Anderson
2023-10-19 21:20 ` Douglas Anderson [this message]
2023-10-19 21:20 ` [PATCH v4 4/5] r8152: Rename RTL8152_UNPLUG to RTL8152_INACCESSIBLE Douglas Anderson
2023-10-19 21:20 ` [PATCH v4 5/5] r8152: Block future register access if register access fails Douglas Anderson
2023-10-20 11:31 ` Hayes Wang
2023-10-20 15:42 ` Doug Anderson
2023-10-20 21:10 ` Doug Anderson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20231019142019.v4.3.I6405b1587446c157c6d6263957571f2b11f330a7@changeid \
--to=dianders@chromium.org \
--cc=bjorn@mork.no \
--cc=davem@davemloft.net \
--cc=ecgh@chromium.org \
--cc=edumazet@google.com \
--cc=grundler@chromium.org \
--cc=hayeswang@realtek.com \
--cc=horms@kernel.org \
--cc=kuba@kernel.org \
--cc=laura.nao@collabora.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=netdev@vger.kernel.org \
--cc=pabeni@redhat.com \
--cc=stern@rowland.harvard.edu \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).