sysmo-bts
/
barebox
9
0
Fork 0
Code Releases Activity

usb: ehci-hcd: detect re-entrance 

Signed-off-by: Peter Mamonov <pmamonov@gmail.com>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Peter Mamonov 2015-09-24 19:20:26 +03:00 committed by Sascha Hauer
parent 4350744bf5
commit 8426cc641d
1 changed files with 38 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

42
drivers/usb/host/ehci-hcd.c
View File

@ -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 {
@ -136,6 +138,20 @@ static struct descriptor {
#define ehci_is_TDI() (ehci->flags & EHCI_HAS_TT)
static void inline ehci_reentrance_detect(struct ehci_priv *ehci,
struct usb_device *dev,
const char *fname)
{
if (ehci->sem)
dev_err(&dev->dev, "%s: re-entrance %d (%s:%s)\n",
fname,
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;
@ -888,12 +904,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, dev, __func__);
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
@ -902,6 +924,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, dev, __func__);
if (usb_pipetype(pipe) != PIPE_CONTROL) {
dev_dbg(ehci->dev, "non-control pipe (type=%lu)", usb_pipetype(pipe));
@ -911,9 +936,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
@ -1236,6 +1265,8 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
void *backbuffer;
int result = 0, ret;
ehci_reentrance_detect(ehci, dev, __func__);
dev_dbg(ehci->dev, "dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
dev, pipe, buffer, length, interval);
@ -1243,8 +1274,10 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
DMA_BIDIRECTIONAL);
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)
@ -1270,6 +1303,7 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
ret = ehci_destroy_int_queue(dev, queue);
if (!result)
result = ret;
ehci->sem--;
return result;
}