From: Peter Mamonov <pmamonov@gmail.com>
To: barebox@lists.infradead.org
Cc: Peter Mamonov <pmamonov@gmail.com>
Subject: [PATCH 2/5] usb: ehci-hcd: detect re-entrance
Date: Mon, 21 Sep 2015 14:30:46 +0300 [thread overview]
Message-ID: <1442835049-20829-3-git-send-email-pmamonov@gmail.com> (raw)
In-Reply-To: <1442835049-20829-1-git-send-email-pmamonov@gmail.com>
Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
---
drivers/usb/host/ehci-hcd.c | 43 ++++++++++++++++++++++++++++++++++++++-----
1 file changed, 38 insertions(+), 5 deletions(-)
diff --git a/drivers/usb/host/ehci-hcd.c b/drivers/usb/host/ehci-hcd.c
index 14bb7d9..133f42e 100644
--- a/drivers/usb/host/ehci-hcd.c
+++ b/drivers/usb/host/ehci-hcd.c
@@ -51,6 +51,8 @@ struct ehci_priv {
int periodic_schedules;
struct QH *periodic_queue;
uint32_t *periodic_list;
+ int sem;
+ struct device_d *usedby;
};
struct int_queue {
@@ -135,6 +137,16 @@ static struct descriptor {
#define ehci_is_TDI() (ehci->flags & EHCI_HAS_TT)
+#define ehci_reentrance_detect(ehci) \
+ if (ehci->sem) \
+ dev_err(&dev->dev, "%s: re-entrance %d (%s:%s)\n", \
+ __func__, \
+ ehci->sem, \
+ ehci->usedby->driver->name, \
+ ehci->usedby->name); \
+ ehci->sem++; \
+ ehci->usedby = &dev->dev;
+
static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec)
{
uint32_t result;
@@ -893,12 +905,18 @@ submit_bulk_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
{
struct usb_host *host = dev->host;
struct ehci_priv *ehci = to_ehci(host);
+ int ret;
+
+ ehci_reentrance_detect(ehci);
if (usb_pipetype(pipe) != PIPE_BULK) {
dev_dbg(ehci->dev, "non-bulk pipe (type=%lu)", usb_pipetype(pipe));
+ ehci->sem--;
return -1;
}
- return ehci_submit_async(dev, pipe, buffer, length, NULL);
+ ret = ehci_submit_async(dev, pipe, buffer, length, NULL);
+ ehci->sem--;
+ return ret;
}
static int
@@ -907,6 +925,9 @@ submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
{
struct usb_host *host = dev->host;
struct ehci_priv *ehci = to_ehci(host);
+ int ret;
+
+ ehci_reentrance_detect(ehci);
if (usb_pipetype(pipe) != PIPE_CONTROL) {
dev_dbg(ehci->dev, "non-control pipe (type=%lu)", usb_pipetype(pipe));
@@ -916,9 +937,13 @@ submit_control_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
if (usb_pipedevice(pipe) == ehci->rootdev) {
if (ehci->rootdev == 0)
dev->speed = USB_SPEED_HIGH;
- return ehci_submit_root(dev, pipe, buffer, length, setup);
+ ret = ehci_submit_root(dev, pipe, buffer, length, setup);
+ ehci->sem--;
+ return ret;
}
- return ehci_submit_async(dev, pipe, buffer, length, setup);
+ ret = ehci_submit_async(dev, pipe, buffer, length, setup);
+ ehci->sem--;
+ return ret;
}
static int
@@ -1246,12 +1271,16 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
void *backbuffer;
int result = 0, ret;
+ ehci_reentrance_detect(ehci);
+
dev_dbg(ehci->dev, "dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
dev, pipe, buffer, length, interval);
queue = ehci_create_int_queue(dev, pipe, 1, length, buffer, interval);
- if (!queue)
+ if (!queue) {
+ ehci->sem--;
return -EINVAL;
+ }
start = get_time_ns();
while ((backbuffer = ehci_poll_int_queue(dev, queue)) == NULL)
@@ -1267,13 +1296,17 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
dev_err(&dev->dev,
"got wrong buffer back (%p instead of %p)\n",
backbuffer, buffer);
+ ehci->sem--;
return -EINVAL;
}
ret = ehci_destroy_int_queue(dev, queue);
- if (ret < 0)
+ if (ret < 0) {
+ ehci->sem--;
return ret;
+ }
+ ehci->sem--;
return result;
}
--
2.1.4
_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox
next prev parent reply other threads:[~2015-09-21 13:16 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-09-21 11:30 [RFC v5 0/2] WIP: add usb keyboard driver Peter Mamonov
2015-09-21 11:30 ` [PATCH 1/5] usb: ehci-hcd: port periodic transactions implementation from the u-boot Peter Mamonov
2015-09-22 6:31 ` Sascha Hauer
2015-09-21 11:30 ` Peter Mamonov [this message]
2015-09-21 11:30 ` [PATCH 3/5] common: clock: introduce mdelay_non_interruptible() Peter Mamonov
2015-09-21 11:30 ` [PATCH 4/5] usb: ehci-hcd: use mdelay_non_inerruptible() Peter Mamonov
2015-09-21 11:30 ` [PATCH 5/5] input: port usb keyboard driver from the u-boot Peter Mamonov
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=1442835049-20829-3-git-send-email-pmamonov@gmail.com \
--to=pmamonov@gmail.com \
--cc=barebox@lists.infradead.org \
/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