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:
parent
4350744bf5
commit
8426cc641d
1 changed files with 38 additions and 4 deletions
|
@ -51,6 +51,8 @@ struct ehci_priv {
|
||||||
int periodic_schedules;
|
int periodic_schedules;
|
||||||
struct QH *periodic_queue;
|
struct QH *periodic_queue;
|
||||||
uint32_t *periodic_list;
|
uint32_t *periodic_list;
|
||||||
|
int sem;
|
||||||
|
struct device_d *usedby;
|
||||||
};
|
};
|
||||||
|
|
||||||
struct int_queue {
|
struct int_queue {
|
||||||
|
@ -136,6 +138,20 @@ static struct descriptor {
|
||||||
|
|
||||||
#define ehci_is_TDI() (ehci->flags & EHCI_HAS_TT)
|
#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)
|
static int handshake(uint32_t *ptr, uint32_t mask, uint32_t done, int usec)
|
||||||
{
|
{
|
||||||
uint32_t result;
|
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 usb_host *host = dev->host;
|
||||||
struct ehci_priv *ehci = to_ehci(host);
|
struct ehci_priv *ehci = to_ehci(host);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ehci_reentrance_detect(ehci, dev, __func__);
|
||||||
|
|
||||||
if (usb_pipetype(pipe) != PIPE_BULK) {
|
if (usb_pipetype(pipe) != PIPE_BULK) {
|
||||||
dev_dbg(ehci->dev, "non-bulk pipe (type=%lu)", usb_pipetype(pipe));
|
dev_dbg(ehci->dev, "non-bulk pipe (type=%lu)", usb_pipetype(pipe));
|
||||||
|
ehci->sem--;
|
||||||
return -1;
|
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
|
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 usb_host *host = dev->host;
|
||||||
struct ehci_priv *ehci = to_ehci(host);
|
struct ehci_priv *ehci = to_ehci(host);
|
||||||
|
int ret;
|
||||||
|
|
||||||
|
ehci_reentrance_detect(ehci, dev, __func__);
|
||||||
|
|
||||||
if (usb_pipetype(pipe) != PIPE_CONTROL) {
|
if (usb_pipetype(pipe) != PIPE_CONTROL) {
|
||||||
dev_dbg(ehci->dev, "non-control pipe (type=%lu)", usb_pipetype(pipe));
|
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 (usb_pipedevice(pipe) == ehci->rootdev) {
|
||||||
if (ehci->rootdev == 0)
|
if (ehci->rootdev == 0)
|
||||||
dev->speed = USB_SPEED_HIGH;
|
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
|
static int
|
||||||
|
@ -1236,6 +1265,8 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
|
||||||
void *backbuffer;
|
void *backbuffer;
|
||||||
int result = 0, ret;
|
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_dbg(ehci->dev, "dev=%p, pipe=%lu, buffer=%p, length=%d, interval=%d",
|
||||||
dev, pipe, buffer, length, interval);
|
dev, pipe, buffer, length, interval);
|
||||||
|
|
||||||
|
@ -1243,8 +1274,10 @@ submit_int_msg(struct usb_device *dev, unsigned long pipe, void *buffer,
|
||||||
DMA_BIDIRECTIONAL);
|
DMA_BIDIRECTIONAL);
|
||||||
|
|
||||||
queue = ehci_create_int_queue(dev, pipe, 1, length, buffer, interval);
|
queue = ehci_create_int_queue(dev, pipe, 1, length, buffer, interval);
|
||||||
if (!queue)
|
if (!queue) {
|
||||||
|
ehci->sem--;
|
||||||
return -EINVAL;
|
return -EINVAL;
|
||||||
|
}
|
||||||
|
|
||||||
start = get_time_ns();
|
start = get_time_ns();
|
||||||
while ((backbuffer = ehci_poll_int_queue(dev, queue)) == NULL)
|
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);
|
ret = ehci_destroy_int_queue(dev, queue);
|
||||||
if (!result)
|
if (!result)
|
||||||
result = ret;
|
result = ret;
|
||||||
|
ehci->sem--;
|
||||||
return result;
|
return result;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue