From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755169AbcEWMBV (ORCPT ); Mon, 23 May 2016 08:01:21 -0400 Received: from mail1.bemta5.messagelabs.com ([195.245.231.138]:27124 "EHLO mail1.bemta5.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754506AbcEWMBS (ORCPT ); Mon, 23 May 2016 08:01:18 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrOIsWRWlGSWpSXmKPExsVyU6Zroi7XR6d wg79fxSz+31nEatG8eD2bxeVdc9gsFi1rZbZYsPERowOrx/65a9g9jt/YzuTxeZNcAHMUa2Ze Un5FAmvGrCVfmAvuc1V8vPSXpYFxAmcXIxeHkMB6RombV14wdjFycrAJmEnserWOHcQWERCS6 NzxgQmkiFlgNaPE2Xkr2UASwgI+EkuuN4DZLAKqEud2N4HZvAJ+Emv6usCaJQTkJG6e62QGsT kF/CV+Nt1jBbGFgGreNm5mgqgXlDg58wkLiM0sICFx8MULZogabYnle/qg5ihIzF61gQnCTpZ of3SXBcK2lmj7+4F9AqPALCSjZiEZtYCRaRWjenFqUVlqka6xXlJRZnpGSW5iZo6uoYGpXm5q cXFiempOYlKxXnJ+7iZGYAAzAMEOxr3/nA4xSnIwKYnyntzhFC7El5SfUpmRWJwRX1Sak1p8i FGGg0NJgvfze6CcYFFqempFWmYOMJZg0hIcPEoivOtB0rzFBYm5xZnpEKlTjIpS4rxHQBICII mM0jy4Nlj8XmKUlRLmZQQ6RIinILUoN7MEVf4VozgHo5Iw7xeQKTyZeSVw018BLWYCWvxQ2gF kcUkiQkqqgTFllSwXp+LbAzoS17iab5gd+HZSV6FU9O85liQWHZWrweHh/zhnn+EJ2Wb0KCWv tJQpOvRVKJ9T0sPMBYe0T3AvbSr9cG669CbPz/KsS9mtWk4LB61V5wku+pQXcnTqDhbNvzufs HN2NPUohPgecXsbUnhtnd58J8Y9EbNravrDPp6Mas6zUGIpzkg01GIuKk4EAJSGDkTaAgAA X-Env-Sender: andrew.goodbody@cambrionix.com X-Msg-Ref: server-11.tower-123.messagelabs.com!1464004873!30040931!1 X-Originating-IP: [217.28.138.145] X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked From: Andrew Goodbody To: CC: , , , Andrew Goodbody , Subject: [PATCH V2 2/2] usb: musb: Stop bulk endpoint while queue is rotated Date: Mon, 23 May 2016 13:00:44 +0100 Message-ID: <1464004844-26553-3-git-send-email-andrew.goodbody@cambrionix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464004844-26553-1-git-send-email-andrew.goodbody@cambrionix.com> References: <1464004844-26553-1-git-send-email-andrew.goodbody@cambrionix.com> MIME-Version: 1.0 Content-Type: text/plain X-Originating-IP: [46.17.166.30] X-ClientProxiedBy: SEHSTE15FE04.hs20.net (172.18.251.44) To SEHSTE15D2BE2.hs20.net (172.18.251.29) X-EXCLAIMER-MD-CONFIG: 266e7a57-cddd-49fd-bdea-19bca6d40303 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org Ensure that the endpoint is stopped by clearing REQPKT before clearing DATAERR_NAKTIMEOUT before rotating the queue on the dedicated bulk endpoint. This addresses an issue where a race could result in the endpoint receiving data before it was reprogrammed resulting in a warning about such data from musb_rx_reinit before it was thrown away. The data thrown away was a valid packet that had been correctly ACKed which meant the host and device got out of sync. Signed-off-by: Andrew Goodbody Cc: stable@vger.kernel.org --- V2 added comment about clearing REQPKT before DATAERR_NAKTIMEOUT drivers/usb/musb/musb_host.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 2966596..676cb98 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -997,6 +997,12 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep, /* clear nak timeout bit */ rx_csr = musb_readw(epio, MUSB_RXCSR); rx_csr |= MUSB_RXCSR_H_WZC_BITS; + /* + * Need to stop the transaction by clearing REQPKT before + * DATAERR_NAKTIMEOUT ref TRM section 16.3.8.2.2.1.2 + */ + rx_csr &= ~MUSB_RXCSR_H_REQPKT; + musb_writew(epio, MUSB_RXCSR, rx_csr); rx_csr &= ~MUSB_RXCSR_DATAERROR; musb_writew(epio, MUSB_RXCSR, rx_csr); -- 2.7.4