| Date: | 2013-12-12 01:06:13 (9 years 9 months ago) |
|---|---|
| Author: | Apelete Seketeli |
| Commit: | 77ae27900e95d4a5d192d3eb538d74d736b23e56 |
| Message: | usb: musb: fix setting JZ4740 gadget periphal mode on reset JZ4740 USB Device Controller is not OTG compatible and does not have DEVCTL register in silicon. During ethernet-over-usb transactions, on reset, musb driver tries to read from DEVCTL and consequently sets device as host (A-Device) instead of peripheral (B-Device), which makes it a composite device to the USB gadget driver. This induces a kernel panic during power down where the USB gadget driver does a null pointer dereference when trying to access the composite device configuration. On reset, do not rely on DEVCTL value for setting gadget peripheral mode: hardcode it instead to B-Device. Signed-off-by: Apelete Seketeli <apelete@seketeli.net> |
| Files: |
drivers/usb/musb/musb_gadget.c (2 diffs) |
Change Details
| drivers/usb/musb/musb_gadget.c | ||
|---|---|---|
| 2115 | 2115 | /* Normal reset, as B-Device; |
| 2116 | 2116 | * or else after HNP, as A-Device |
| 2117 | 2117 | */ |
| 2118 | #if defined(CONFIG_USB_MUSB_JZ4740) || defined(CONFIG_USB_MUSB_JZ4740_MODULE) | |
| 2119 | /* JZ4740 UDC Controller is not OTG compatible and does not | |
| 2120 | * have DEVCTL register in silicon: do not rely on devctl for | |
| 2121 | * setting peripheral mode. | |
| 2122 | */ | |
| 2123 | musb->xceiv->state = OTG_STATE_B_PERIPHERAL; | |
| 2124 | musb->g.is_a_peripheral = 0; | |
| 2125 | #else | |
| 2118 | 2126 | if (devctl & MUSB_DEVCTL_BDEVICE) { |
| 2119 | 2127 | musb->xceiv->state = OTG_STATE_B_PERIPHERAL; |
| 2120 | 2128 | musb->g.is_a_peripheral = 0; |
| ... | ... | |
| 2122 | 2130 | musb->xceiv->state = OTG_STATE_A_PERIPHERAL; |
| 2123 | 2131 | musb->g.is_a_peripheral = 1; |
| 2124 | 2132 | } |
| 2133 | #endif | |
| 2125 | 2134 | |
| 2126 | 2135 | /* start with default limits on VBUS power draw */ |
| 2127 | 2136 | (void) musb_gadget_vbus_draw(&musb->g, 8); |
Branches:
ben-wpan
ben-wpan-stefan
5396a9238205f20f811ea57898980d3ca82df0b6
jz-2.6.34
jz-2.6.34-rc5
jz-2.6.34-rc6
jz-2.6.34-rc7
jz-2.6.35
jz-2.6.36
jz-2.6.37
jz-2.6.38
jz-2.6.39
jz-3.0
jz-3.1
jz-3.11
jz-3.12
jz-3.13
jz-3.15
jz-3.16
jz-3.18-dt
jz-3.2
jz-3.3
jz-3.4
jz-3.5
jz-3.6
jz-3.6-rc2-pwm
jz-3.9
jz-3.9-clk
jz-3.9-rc8
jz47xx
jz47xx-2.6.38
master
Tags:
od-2011-09-04
od-2011-09-18
v2.6.34-rc5
v2.6.34-rc6
v2.6.34-rc7
v3.9
