Skip to content

Commit a8f7a6d

Browse files
Andrew Goodbodygregkh
authored andcommitted
usb: musb: Ensure rx reinit occurs for shared_fifo endpoints
commit f3eec0cf784e0d6c47822ca6b66df3d5812af7e6 upstream. shared_fifo endpoints would only get a previous tx state cleared out, the rx state was only cleared for non shared_fifo endpoints Change this so that the rx state is cleared for all endpoints. This addresses an issue that resulted in rx packets being dropped silently. Signed-off-by: Andrew Goodbody <andrew.goodbody@cambrionix.com> Signed-off-by: Bin Liu <b-liu@ti.com> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
1 parent a2cf342 commit a8f7a6d

1 file changed

Lines changed: 6 additions & 7 deletions

File tree

drivers/usb/musb/musb_host.c

Lines changed: 6 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -594,14 +594,13 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, u8 epnum)
594594
musb_writew(ep->regs, MUSB_TXCSR, 0);
595595

596596
/* scrub all previous state, clearing toggle */
597-
} else {
598-
csr = musb_readw(ep->regs, MUSB_RXCSR);
599-
if (csr & MUSB_RXCSR_RXPKTRDY)
600-
WARNING("rx%d, packet/%d ready?\n", ep->epnum,
601-
musb_readw(ep->regs, MUSB_RXCOUNT));
602-
603-
musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
604597
}
598+
csr = musb_readw(ep->regs, MUSB_RXCSR);
599+
if (csr & MUSB_RXCSR_RXPKTRDY)
600+
WARNING("rx%d, packet/%d ready?\n", ep->epnum,
601+
musb_readw(ep->regs, MUSB_RXCOUNT));
602+
603+
musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
605604

606605
/* target addr and (for multipoint) hub addr/port */
607606
if (musb->is_multipoint) {

0 commit comments

Comments
 (0)