domenico/openwrt_NSS_ACW
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

udc: Fix recursive spinlocks

Browse Source 
Driver had recursive spinlock locking: 1. jz4740_queue() acquires lock 2. done()
is called in chain:
jz4740_queue()->jz4740_ep0_kick()->jz4740_ep0_in()->write_fifo_ep0()->done() and
it tries to acquire same lock. 3. Deadlock.

Signed-off-by:
Yauhen Kharuzhy <jekhor@gmail.com>

SVN-Revision: 21619
This commit is contained in:
Lars-Peter Clausen
2010-05-29 00:12:09 +00:00
parent e66107e12b
commit c88f0ac390
1 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

27
target/linux/xburst/patches-2.6.34/056-udc.patch
View File

@@ -1,4 +1,4 @@
From 9b62834f0e2aba2111ba22e734982f7c71293355 Mon Sep 17 00:00:00 2001 From 644d56ba485f220b1b740b320760a12b5e4e0308 Mon Sep 17 00:00:00 2001
From: Lars-Peter Clausen <lars@metafoo.de> From: Lars-Peter Clausen <lars@metafoo.de>
Date: Sat, 24 Apr 2010 12:18:46 +0200 Date: Sat, 24 Apr 2010 12:18:46 +0200
Subject: [PATCH] Add jz4740 udc driver Subject: [PATCH] Add jz4740 udc driver
@@ -7,9 +7,9 @@ Subject: [PATCH] Add jz4740 udc driver
drivers/usb/gadget/Kconfig | 14 + drivers/usb/gadget/Kconfig | 14 +
drivers/usb/gadget/Makefile | 1 + drivers/usb/gadget/Makefile | 1 +
drivers/usb/gadget/gadget_chips.h | 9 + drivers/usb/gadget/gadget_chips.h | 9 +
drivers/usb/gadget/jz4740_udc.c | 2439 +++++++++++++++++++++++++++++++++++++ drivers/usb/gadget/jz4740_udc.c | 2437 +++++++++++++++++++++++++++++++++++++
drivers/usb/gadget/jz4740_udc.h | 99 ++ drivers/usb/gadget/jz4740_udc.h | 100 ++
5 files changed, 2562 insertions(+), 0 deletions(-) 5 files changed, 2561 insertions(+), 0 deletions(-)
create mode 100644 drivers/usb/gadget/jz4740_udc.c create mode 100644 drivers/usb/gadget/jz4740_udc.c
create mode 100644 drivers/usb/gadget/jz4740_udc.h create mode 100644 drivers/usb/gadget/jz4740_udc.h
@@ -84,10 +84,10 @@ index e511fec..b2ec5fb 100644
diff --git a/drivers/usb/gadget/jz4740_udc.c b/drivers/usb/gadget/jz4740_udc.c diff --git a/drivers/usb/gadget/jz4740_udc.c b/drivers/usb/gadget/jz4740_udc.c
new file mode 100644 new file mode 100644
index 0000000..bea1a37 index 0000000..e84c817
--- /dev/null --- /dev/null
+++ b/drivers/usb/gadget/jz4740_udc.c +++ b/drivers/usb/gadget/jz4740_udc.c
@@ -0,0 +1,2439 @@ @@ -0,0 +1,2437 @@
+/* +/*
+ * linux/drivers/usb/gadget/jz4740_udc.c + * linux/drivers/usb/gadget/jz4740_udc.c
+ * + *
@@ -863,7 +863,6 @@ index 0000000..bea1a37
+static void done(struct jz4740_ep *ep, struct jz4740_request *req, int status) +static void done(struct jz4740_ep *ep, struct jz4740_request *req, int status)
+{ +{
+ unsigned int stopped = ep->stopped; + unsigned int stopped = ep->stopped;
+ unsigned long flags;
+ uint32_t index; + uint32_t index;
+ +
+ DEBUG("%s, %p\n", __FUNCTION__, ep); + DEBUG("%s, %p\n", __FUNCTION__, ep);
@@ -882,14 +881,14 @@ index 0000000..bea1a37
+ /* don't modify queue heads during completion callback */ + /* don't modify queue heads during completion callback */
+ ep->stopped = 1; + ep->stopped = 1;
+ /* Read current index (completion may modify it) */ + /* Read current index (completion may modify it) */
+ spin_lock_irqsave(&ep->dev->lock, flags);
+ index = usb_readb(ep->dev, JZ_REG_UDC_INDEX); + index = usb_readb(ep->dev, JZ_REG_UDC_INDEX);
+ spin_unlock_irqrestore(&ep->dev->lock, ep->dev->lock_flags);
+ +
+ req->req.complete(&ep->ep, &req->req); + req->req.complete(&ep->ep, &req->req);
+ +
+ spin_lock_irqsave(&ep->dev->lock, ep->dev->lock_flags);
+ /* Restore index */ + /* Restore index */
+ jz_udc_set_index(ep->dev, index); + jz_udc_set_index(ep->dev, index);
+ spin_unlock_irqrestore(&ep->dev->lock, flags);
+ ep->stopped = stopped; + ep->stopped = stopped;
+} +}
+ +
@@ -1344,7 +1343,6 @@ index 0000000..bea1a37
+ struct jz4740_request *req; + struct jz4740_request *req;
+ struct jz4740_ep *ep; + struct jz4740_ep *ep;
+ struct jz4740_udc *dev; + struct jz4740_udc *dev;
+ unsigned long flags;
+ +
+ DEBUG("%s, %p\n", __FUNCTION__, _ep); + DEBUG("%s, %p\n", __FUNCTION__, _ep);
+ +
@@ -1371,7 +1369,7 @@ index 0000000..bea1a37
+ DEBUG("%s queue req %p, len %d buf %p\n", _ep->name, _req, _req->length, + DEBUG("%s queue req %p, len %d buf %p\n", _ep->name, _req, _req->length,
+ _req->buf); + _req->buf);
+ +
+ spin_lock_irqsave(&dev->lock, flags); + spin_lock_irqsave(&dev->lock, dev->lock_flags);
+ +
+ _req->status = -EINPROGRESS; + _req->status = -EINPROGRESS;
+ _req->actual = 0; + _req->actual = 0;
@@ -1417,7 +1415,7 @@ index 0000000..bea1a37
+ if (likely(req != 0)) + if (likely(req != 0))
+ list_add_tail(&req->queue, &ep->queue); + list_add_tail(&req->queue, &ep->queue);
+ +
+ spin_unlock_irqrestore(&dev->lock, flags); + spin_unlock_irqrestore(&dev->lock, dev->lock_flags);
+ +
+ return 0; + return 0;
+} +}
@@ -2529,10 +2527,10 @@ index 0000000..bea1a37
+MODULE_LICENSE("GPL"); +MODULE_LICENSE("GPL");
diff --git a/drivers/usb/gadget/jz4740_udc.h b/drivers/usb/gadget/jz4740_udc.h diff --git a/drivers/usb/gadget/jz4740_udc.h b/drivers/usb/gadget/jz4740_udc.h
new file mode 100644 new file mode 100644
index 0000000..ac1540f index 0000000..7156768
--- /dev/null --- /dev/null
+++ b/drivers/usb/gadget/jz4740_udc.h +++ b/drivers/usb/gadget/jz4740_udc.h
@@ -0,0 +1,99 @@ @@ -0,0 +1,100 @@
+/* +/*
+ * linux/drivers/usb/gadget/jz4740_udc.h + * linux/drivers/usb/gadget/jz4740_udc.h
+ * + *
@@ -2608,6 +2606,7 @@ index 0000000..ac1540f
+ struct usb_gadget_driver *driver; + struct usb_gadget_driver *driver;
+ struct device *dev; + struct device *dev;
+ spinlock_t lock; + spinlock_t lock;
+ unsigned long lock_flags;
+ +
+ enum ep0state ep0state; + enum ep0state ep0state;
+ struct jz4740_ep ep[UDC_MAX_ENDPOINTS]; + struct jz4740_ep ep[UDC_MAX_ENDPOINTS];