Date:2013-12-12 01:06:13 (6 years 6 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
21152115    /* Normal reset, as B-Device;
21162116     * or else after HNP, as A-Device
21172117     */
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
21182126    if (devctl & MUSB_DEVCTL_BDEVICE) {
21192127        musb->xceiv->state = OTG_STATE_B_PERIPHERAL;
21202128        musb->g.is_a_peripheral = 0;
...... 
21222130        musb->xceiv->state = OTG_STATE_A_PERIPHERAL;
21232131        musb->g.is_a_peripheral = 1;
21242132    }
2133#endif
21252134
21262135    /* start with default limits on VBUS power draw */
21272136    (void) musb_gadget_vbus_draw(&musb->g, 8);

Archive Download the corresponding diff file



interactive