mirror of https://lore.kernel.org/lkml/
 help / color / mirror / Atom feed
From: Andrew Goodbody <andrew.goodbody@cambrionix.com>
To: <b-liu@ti.com>
Cc: <gregkh@linuxfoundation.org>, <linux-usb@vger.kernel.org>,
	<linux-kernel@vger.kernel.org>,
	Andrew Goodbody <andrew.goodbody@cambrionix.com>,
	<stable@vger.kernel.org>
Subject: [PATCH 1/2] usb: musb: Ensure rx reinit occurs for shared_fifo endpoints
Date: Fri, 20 May 2016 15:51:41 +0100	[thread overview]
Message-ID: <1463755902-12922-2-git-send-email-andrew.goodbody@cambrionix.com> (raw)
In-Reply-To: <1463755902-12922-1-git-send-email-andrew.goodbody@cambrionix.com>

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>
Cc: stable@vger.kernel.org
---
 drivers/usb/musb/musb_host.c | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c
index 2f8ad7f..30e0d65 100644
--- a/drivers/usb/musb/musb_host.c
+++ b/drivers/usb/musb/musb_host.c
@@ -594,14 +594,15 @@ musb_rx_reinit(struct musb *musb, struct musb_qh *qh, u8 epnum)
 		musb_writew(ep->regs, MUSB_TXCSR, 0);
 
 	/* scrub all previous state, clearing toggle */
-	} else {
-		csr = musb_readw(ep->regs, MUSB_RXCSR);
-		if (csr & MUSB_RXCSR_RXPKTRDY)
-			WARNING("rx%d, packet/%d ready?\n", ep->epnum,
-				musb_readw(ep->regs, MUSB_RXCOUNT));
-
-		musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
 	}
+	csr = musb_readw(ep->regs, MUSB_RXCSR);
+	if (csr & MUSB_RXCSR_RXPKTRDY) {
+		WARNING("rx%d, packet/%d ready?\n", ep->epnum,
+			musb_readw(ep->regs, MUSB_RXCOUNT));
+		urb_qh_dump(musb);
+	}
+
+	musb_h_flush_rxfifo(ep, MUSB_RXCSR_CLRDATATOG);
 
 	/* target addr and (for multipoint) hub addr/port */
 	if (musb->is_multipoint) {
-- 
2.7.4

  reply	other threads:[~2016-05-20 14:54 UTC|newest]

Thread overview: 9+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2016-05-20 14:51 [PATCH 0/2] usb: musb: fix dropped packets Andrew Goodbody
2016-05-20 14:51 ` Andrew Goodbody [this message]
2016-05-20 15:26   ` [PATCH 1/2] usb: musb: Ensure rx reinit occurs for shared_fifo endpoints Sergei Shtylyov
2016-05-20 17:01     ` Andrew Goodbody
2016-05-20 14:51 ` [PATCH 2/2] usb: musb: Stop bulk endpoint while queue is rotated Andrew Goodbody
2016-05-20 16:21   ` Sergei Shtylyov
2016-05-20 17:06     ` Andrew Goodbody
2016-05-20 17:14       ` Sergei Shtylyov
2016-05-20 17:24         ` Andrew Goodbody

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1463755902-12922-2-git-send-email-andrew.goodbody@cambrionix.com \
    --to=andrew.goodbody@cambrionix.com \
    --cc=b-liu@ti.com \
    --cc=gregkh@linuxfoundation.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-usb@vger.kernel.org \
    --cc=stable@vger.kernel.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox

all inboxes | Powered by JetHome®