summaryrefslogtreecommitdiffstats
path: root/drivers/usb
diff options
context:
space:
mode:
authorNeil Zhang <zhangwm@marvell.com>2011-10-12 16:49:26 +0800
committerFelipe Balbi <balbi@ti.com>2011-10-13 20:41:57 +0300
commit4540a9ab319f1a55ded5f635da66da60d3c93e69 (patch)
tree35aa060b0900c1fcf72fba5b0f213aef076774d5 /drivers/usb
parent5d0b8d0f3af46c5364bc36f814cf2c407012dd1b (diff)
downloadblackbird-obmc-linux-4540a9ab319f1a55ded5f635da66da60d3c93e69.tar.gz
blackbird-obmc-linux-4540a9ab319f1a55ded5f635da66da60d3c93e69.zip
usb: gadget: mv_udc: fix kernel panic on some platforms
Some platforms will use usb to download images, the controller may not be stopped correctly when start kernel. In some cases, it may have some pending interrupts, and they will be triggered immediately when we finish requesting irq in function probe. But we haven't finished the device initialization at this time. So let's stop udc here to avoid this case occurred. Signed-off-by: Neil Zhang <zhangwm@marvell.com> Signed-off-by: Felipe Balbi <balbi@ti.com>
Diffstat (limited to 'drivers/usb')
-rw-r--r--drivers/usb/gadget/mv_udc_core.c7
1 files changed, 7 insertions, 0 deletions
diff --git a/drivers/usb/gadget/mv_udc_core.c b/drivers/usb/gadget/mv_udc_core.c
index cd4de00a3ff5..84655289aea9 100644
--- a/drivers/usb/gadget/mv_udc_core.c
+++ b/drivers/usb/gadget/mv_udc_core.c
@@ -2037,6 +2037,13 @@ static int __devinit mv_udc_probe(struct platform_device *dev)
& CAPLENGTH_MASK));
udc->max_eps = readl(&udc->cap_regs->dccparams) & DCCPARAMS_DEN_MASK;
+ /*
+ * some platform will use usb to download image, it may not disconnect
+ * usb gadget before loading kernel. So first stop udc here.
+ */
+ udc_stop(udc);
+ writel(0xFFFFFFFF, &udc->op_regs->usbsts);
+
size = udc->max_eps * sizeof(struct mv_dqh) *2;
size = (size + DQH_ALIGNMENT - 1) & ~(DQH_ALIGNMENT - 1);
udc->ep_dqh = dma_alloc_coherent(&dev->dev, size,
OpenPOWER on IntegriCloud