From: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
To: Mathias Nyman <mathias.nyman@intel.com>
Cc: oneukum@suse.com, Nicolas Saenz Julienne <nsaenzjulienne@suse.de>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org
Subject: [PATCH v2] xhci: clear port_remote_wakeup after resume failure
Date: Tue, 2 Jul 2019 13:12:00 +0200 [thread overview]
Message-ID: <20190702111200.15164-1-nsaenzjulienne@suse.de> (raw)
This was seen on a Dell Precision 5520 using it's WD15 dock. The dock's
Ethernet connectivity is provided though USB. While idle, both the
Ethernet device and XHCI are suspended by runtime PM. To be then resumed
on behalf of the Ethernet device, which has remote wake-up capabilities.
The Ethernet device was observed to randomly disconnect from the USB
port shortly after submitting it's remote wake-up request. Probably a
weird timing issue yet to be investigated. This causes runtime PM to
busyloop causing some tangible CPU load. The reason is the port gets
stuck in the middle of a remote wake-up operation, waiting for the
device to switch to U0. This never happens, leaving "port_remote_wakeup"
enabled, and automatically triggering a failure on any further suspend
operation.
This patch clears "port_remote_wakeup" upon detecting a device with a
wrong PORT_CONNECT state. Making sure the above mentioned situation
doesn't trigger a PM busyloop.
Signed-off-by: Nicolas Saenz Julienne <nsaenzjulienne@suse.de>
---
Changes since v1:
- Do not trigger clear based on PLS_MASK != XDEV_RESUME to avoid a
potential race condition between the irq handler and hub thread.
drivers/usb/host/xhci-hub.c | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 3abe70ff1b1e..05cd46a11c0c 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -1047,8 +1047,8 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
xhci_get_usb2_port_status(port, &status, raw_port_status,
flags);
/*
- * Clear stale usb2 resume signalling variables in case port changed
- * state during resume signalling. For example on error
+ * Clear stale resume signalling variables in case port changed
+ * state during resume signalling. For example on error.
*/
if ((bus_state->resume_done[wIndex] ||
test_bit(wIndex, &bus_state->resuming_ports)) &&
@@ -1057,6 +1057,9 @@ static u32 xhci_get_port_status(struct usb_hcd *hcd,
bus_state->resume_done[wIndex] = 0;
clear_bit(wIndex, &bus_state->resuming_ports);
usb_hcd_end_port_resume(&hcd->self, wIndex);
+ } else if (bus_state->port_remote_wakeup & (1 << port->hcd_portnum) &&
+ !(raw_port_status & PORT_CONNECT)) {
+ bus_state->port_remote_wakeup &= ~(1 << port->hcd_portnum);
}
if (bus_state->port_c_suspend & (1 << wIndex))
--
2.22.0
reply other threads:[~2019-07-02 11:12 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
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=20190702111200.15164-1-nsaenzjulienne@suse.de \
--to=nsaenzjulienne@suse.de \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.com \
--cc=oneukum@suse.com \
/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).