From: Kai-Heng Feng <kai.heng.feng@canonical.com>
To: mathias.nyman@intel.com, gregkh@linuxfoundation.org,
stern@rowland.harvard.edu
Cc: acelan.kao@canonical.com, linux-usb@vger.kernel.org,
linux-kernel@vger.kernel.org,
Kai-Heng Feng <kai.heng.feng@canonical.com>
Subject: [PATCH 2/3] xhci: Wait until link state trainsits to U0 after setting USB_SS_PORT_LS_U0
Date: Fri, 3 Jan 2020 16:40:07 +0800 [thread overview]
Message-ID: <20200103084008.3579-2-kai.heng.feng@canonical.com> (raw)
In-Reply-To: <20200103084008.3579-1-kai.heng.feng@canonical.com>
Like U3 case, xHCI spec doesn't specify the upper bound of U0 transition
time. The 20ms is not enough for some devices.
Intead of polling PLS or PLC, we can facilitate the port change event to
know that the link transits to U0 is completed.
Signed-off-by: Kai-Heng Feng <kai.heng.feng@canonical.com>
---
drivers/usb/host/xhci-hub.c | 8 +++++++-
drivers/usb/host/xhci-mem.c | 1 +
drivers/usb/host/xhci-ring.c | 1 +
drivers/usb/host/xhci.h | 1 +
4 files changed, 10 insertions(+), 1 deletion(-)
diff --git a/drivers/usb/host/xhci-hub.c b/drivers/usb/host/xhci-hub.c
index 2b2e9d004dbf..07886a1bce62 100644
--- a/drivers/usb/host/xhci-hub.c
+++ b/drivers/usb/host/xhci-hub.c
@@ -1310,11 +1310,17 @@ int xhci_hub_control(struct usb_hcd *hcd, u16 typeReq, u16 wValue,
spin_lock_irqsave(&xhci->lock, flags);
}
}
+ if (link_state == USB_SS_PORT_LS_U0)
+ reinit_completion(&ports[wIndex]->link_state_changed);
xhci_set_link_state(xhci, ports[wIndex], link_state);
spin_unlock_irqrestore(&xhci->lock, flags);
- msleep(20); /* wait device to enter */
+ if (link_state == USB_SS_PORT_LS_U0) {
+ if (!wait_for_completion_timeout(&ports[wIndex]->link_state_changed, msecs_to_jiffies(100)))
+ xhci_dbg(xhci, "missing U0 port change event for port %d-%d\n", hcd->self.busnum, wIndex + 1);
+ } else
+ msleep(20); /* wait device to enter */
spin_lock_irqsave(&xhci->lock, flags);
if (link_state == USB_SS_PORT_LS_U3) {
diff --git a/drivers/usb/host/xhci-mem.c b/drivers/usb/host/xhci-mem.c
index 3b1388fa2f36..c760a28e3556 100644
--- a/drivers/usb/host/xhci-mem.c
+++ b/drivers/usb/host/xhci-mem.c
@@ -2268,6 +2268,7 @@ static int xhci_setup_port_arrays(struct xhci_hcd *xhci, gfp_t flags)
xhci->hw_ports[i].addr = &xhci->op_regs->port_status_base +
NUM_PORT_REGS * i;
xhci->hw_ports[i].hw_portnum = i;
+ init_completion(&xhci->hw_ports[i].link_state_changed);
}
xhci->rh_bw = kcalloc_node(num_ports, sizeof(*xhci->rh_bw), flags,
diff --git a/drivers/usb/host/xhci-ring.c b/drivers/usb/host/xhci-ring.c
index d23f7408c81f..44d91a53bf07 100644
--- a/drivers/usb/host/xhci-ring.c
+++ b/drivers/usb/host/xhci-ring.c
@@ -1677,6 +1677,7 @@ static void handle_port_status(struct xhci_hcd *xhci,
(portsc & PORT_PLS_MASK) == XDEV_U1 ||
(portsc & PORT_PLS_MASK) == XDEV_U2)) {
xhci_dbg(xhci, "resume SS port %d finished\n", port_id);
+ complete(&port->link_state_changed);
/* We've just brought the device into U0/1/2 through either the
* Resume state after a device remote wakeup, or through the
* U3Exit state after a host-initiated resume. If it's a device
diff --git a/drivers/usb/host/xhci.h b/drivers/usb/host/xhci.h
index 13d8838cd552..b86a664453dc 100644
--- a/drivers/usb/host/xhci.h
+++ b/drivers/usb/host/xhci.h
@@ -1708,6 +1708,7 @@ struct xhci_port {
int hw_portnum;
int hcd_portnum;
struct xhci_hub *rhub;
+ struct completion link_state_changed;
};
struct xhci_hub {
--
2.17.1
next prev parent reply other threads:[~2020-01-03 8:40 UTC|newest]
Thread overview: 24+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-01-03 8:40 [PATCH 1/3] xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3 Kai-Heng Feng
2020-01-03 8:40 ` Kai-Heng Feng [this message]
2020-01-10 15:29 ` [PATCH 2/3] xhci: Wait until link state trainsits to U0 after setting USB_SS_PORT_LS_U0 Mathias Nyman
2020-01-13 9:18 ` Kai-Heng Feng
2020-01-14 14:48 ` Mathias Nyman
2020-01-03 8:40 ` [PATCH 3/3] USB: Disable LPM on WD19's Realtek Hub during setting its ports to U0 Kai-Heng Feng
2020-01-03 15:21 ` Alan Stern
2020-01-03 16:25 ` Kai-Heng Feng
2020-01-03 16:54 ` Alan Stern
2020-01-04 6:41 ` Kai-Heng Feng
2020-01-04 16:20 ` Alan Stern
2020-01-06 6:19 ` Kai-Heng Feng
2020-01-06 15:08 ` Alan Stern
2020-01-10 7:35 ` Kai-Heng Feng
2020-01-10 8:02 ` [PATCH v2 3/3] USB: Disable LPM on WD19's Realtek Hub Kai-Heng Feng
2020-01-10 15:40 ` Alan Stern
2020-01-10 15:51 ` Kai-Heng Feng
2020-01-10 16:36 ` Alan Stern
2020-01-10 16:46 ` Kai-Heng Feng
2020-01-11 19:23 ` Greg KH
2020-01-13 9:06 ` Kai-Heng Feng
2020-01-10 9:34 ` [PATCH 1/3] xhci: Ensure link state is U3 after setting USB_SS_PORT_LS_U3 Mathias Nyman
2020-01-13 9:10 ` Kai-Heng Feng
2020-01-14 15:07 ` Mathias Nyman
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=20200103084008.3579-2-kai.heng.feng@canonical.com \
--to=kai.heng.feng@canonical.com \
--cc=acelan.kao@canonical.com \
--cc=gregkh@linuxfoundation.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-usb@vger.kernel.org \
--cc=mathias.nyman@intel.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).