From: Lu Baolu <baolu.lu@linux.intel.com>
To: Mathias Nyman <mathias.nyman@intel.com>,
Greg Kroah-Hartman <gregkh@linuxfoundation.org>,
Alan Stern <stern@rowland.harvard.edu>
Cc: linux-usb@vger.kernel.org, linux-kernel@vger.kernel.org,
Lu Baolu <baolu.lu@linux.intel.com>
Subject: [PATCH 08/12] usb: xhci: dbc: handle endpoint stall
Date: Wed, 28 Oct 2015 16:00:39 +0800 [thread overview]
Message-ID: <1446019243-5565-9-git-send-email-baolu.lu@linux.intel.com> (raw)
In-Reply-To: <1446019243-5565-1-git-send-email-baolu.lu@linux.intel.com>
In case of endpoint stall, software is able to detect the situation
by reading DCCTRL.HIT or DCCTRL.HOT bits. DbC follows the normal USB
framework to handle endpoint stall. When software detects endpoint
stall situation, it should wait until endpoint is recovered before
read or write oprations.
Signed-off-by: Lu Baolu <baolu.lu@linux.intel.com>
---
drivers/usb/early/xhci-dbc.c | 36 ++++++++++++++++++++++++++++++++++++
1 file changed, 36 insertions(+)
diff --git a/drivers/usb/early/xhci-dbc.c b/drivers/usb/early/xhci-dbc.c
index 8a5a51f..aaf655f 100644
--- a/drivers/usb/early/xhci-dbc.c
+++ b/drivers/usb/early/xhci-dbc.c
@@ -1176,6 +1176,37 @@ static int xdbc_wait_until_dbc_configured(void)
return -ETIMEDOUT;
}
+static int xdbc_wait_until_epstall_cleared(bool read)
+{
+ int timeout = 0;
+
+ if (read) {
+ do {
+ if (!(readl(&xdbcp->xdbc_reg->control) & CTRL_HIT)) {
+ xdbcp->in_ep_state = EP_RUNNING;
+
+ return 0;
+ }
+
+ xdbcp->in_ep_state = EP_HALTED;
+ xdbc_udelay(10);
+ } while (timeout++ < XDBC_LOOPS);
+ } else {
+ do {
+ if (!(readl(&xdbcp->xdbc_reg->control) & CTRL_HOT)) {
+ xdbcp->out_ep_state = EP_RUNNING;
+
+ return 0;
+ }
+
+ xdbcp->out_ep_state = EP_HALTED;
+ xdbc_udelay(10);
+ } while (timeout++ < XDBC_LOOPS);
+ }
+
+ return -ETIMEDOUT;
+}
+
static int xdbc_bulk_transfer(void *data, int size, int loops, bool read)
{
u64 addr;
@@ -1195,6 +1226,11 @@ static int xdbc_bulk_transfer(void *data, int size, int loops, bool read)
return -EPERM;
}
+ if (xdbc_wait_until_epstall_cleared(read)) {
+ xdbc_trace("%s: endpoint not ready\n", __func__);
+ return -EPERM;
+ }
+
ring = (read ? &xdbcp->in_ring : &xdbcp->out_ring);
trb = ring->enqueue;
cycle = ring->cycle_state;
--
2.1.4
next prev parent reply other threads:[~2015-10-28 8:01 UTC|newest]
Thread overview: 29+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-10-28 8:00 [PATCH 00/12] usb: early: add support for early printk through USB3 debug port Lu Baolu
2015-10-28 8:00 ` [PATCH 01/12] usb: xhci: expose xhci extended capabilities via debugfs Lu Baolu
2015-10-28 9:27 ` Oliver Neukum
2015-10-29 1:18 ` Lu, Baolu
2015-10-28 12:40 ` Greg Kroah-Hartman
2015-10-29 1:22 ` Lu, Baolu
2015-10-30 12:09 ` Lu, Baolu
2015-10-30 14:45 ` Greg Kroah-Hartman
2015-11-02 13:07 ` Lu, Baolu
2015-10-28 8:00 ` [PATCH 02/12] x86: fixmap: add permanent fixmap for xhci debug port Lu Baolu
2015-10-28 8:00 ` [PATCH 03/12] usb: xhci: dbc: probe and setup xhci debug capability Lu Baolu
2015-10-28 8:00 ` [PATCH 04/12] usb: xhci: dbc: add support for Intel xHCI dbc quirk Lu Baolu
2015-10-28 8:00 ` [PATCH 05/12] usb: xhci: dbc: add debug buffer Lu Baolu
2015-10-28 8:00 ` [PATCH 06/12] usb: xhci: dbc: add bulk out and bulk in interfaces Lu Baolu
2015-10-28 8:00 ` [PATCH 07/12] usb: xhci: dbc: handle dbc-configured exit Lu Baolu
2015-10-28 8:00 ` Lu Baolu [this message]
2015-10-28 8:00 ` [PATCH 09/12] x86: early_printk: add USB3 debug port earlyprintk support Lu Baolu
2015-10-28 8:00 ` [PATCH 10/12] usb: xhci: dbc: add handshake between debug target and host Lu Baolu
2015-10-28 8:00 ` [PATCH 11/12] usb: serial: usb_debug: add support for dbc debug device Lu Baolu
2015-10-28 9:10 ` Johan Hovold
2015-10-29 1:24 ` Lu, Baolu
2015-10-28 12:33 ` Greg Kroah-Hartman
2015-10-29 1:43 ` Lu, Baolu
2015-10-30 11:46 ` Lu, Baolu
2015-10-30 14:41 ` Greg Kroah-Hartman
2015-10-31 5:37 ` Lu, Baolu
2015-10-28 8:00 ` [PATCH 12/12] usb: doc: add document for xHCI DbC driver Lu Baolu
2015-11-03 9:42 ` [PATCH 00/12] usb: early: add support for early printk through USB3 debug port Dave Young
2015-11-04 0:40 ` Lu, Baolu
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=1446019243-5565-9-git-send-email-baolu.lu@linux.intel.com \
--to=baolu.lu@linux.intel.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.