From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S932296AbcEXIXr (ORCPT ); Tue, 24 May 2016 04:23:47 -0400 Received: from mail1.bemta3.messagelabs.com ([195.245.230.169]:6183 "EHLO mail1.bemta3.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753469AbcEXIWu (ORCPT ); Tue, 24 May 2016 04:22:50 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFjrGIsWRWlGSWpSXmKPExsVyU6Zrom4ov0u 4wc0/2hb/7yxitWhevJ7N4vKuOWwWi5a1Mlss2PiI0YHVY//cNewex29sZ/L4vEkugDmKNTMv Kb8igTXj4OR1bAX/eCp2zVnI1MD4mauLkYtDSGA9o8Tu2deZuxg5OdgEzCR2vVrHDmKLCAhJd O74wARSxCywmlHi7LyVbF2MHBzCAj4SB9odQGpYBFQlFu3+wQJi8wr4SbzvbASzJQTkJG6e6w SbySngL3H/2DFGEFsIqKZjwiZ2iHpBiZMzn4DVMwtISBx88YIZokZbYvmePnaIOQoSs1dtYIK wkyUanp+Asq0l2v5+YJ/AKDALyahZSEYtYGRaxahenFpUllqka6KXVJSZnlGSm5iZo2toYKyX m1pcnJiempOYVKyXnJ+7iREYvgxAsIOx8YvTIUZJDiYlUd7V75zDhfiS8lMqMxKLM+KLSnNSi w8xynBwKEnw2vC5hAsJFqWmp1akZeYAIwkmLcHBoyTCe5cXKM1bXJCYW5yZDpE6xagoJc4rBd InAJLIKM2Da4NF7yVGWSlhXkagQ4R4ClKLcjNLUOVfMYpzMCoJ83qATOHJzCuBm/4KaDET0GL /L84gi0sSEVJSDYxlvuzRx4+uCS2Jm8JpfFJSrCU/t2T101Ktv++aVu8JjNuot9hzWuL68oSy dI/Y6IiLl5M+WTCYsAofeZ2Yunit+/a8wJ5s+1Cx+9afL+yu8uFiSrn9oFF+08FXzyZNP8iwe iLLarvWc+kWH5fPt1nw2VR416UXK97tWxu9+DbTMf8eBh+jog4lluKMREMt5qLiRABzT2m02Q IAAA== X-Env-Sender: andrew.goodbody@cambrionix.com X-Msg-Ref: server-6.tower-134.messagelabs.com!1464078165!32115039!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 V3 2/2] usb: musb: Stop bulk endpoint while queue is rotated Date: Tue, 24 May 2016 09:22:34 +0100 Message-ID: <1464078154-13157-3-git-send-email-andrew.goodbody@cambrionix.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1464078154-13157-1-git-send-email-andrew.goodbody@cambrionix.com> References: <1464078154-13157-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: SEHSTE15FE11.hs20.net (172.18.251.39) 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 --- V3 removed the old comment, moved the new comment in place of the old one and updated it to better reference the programmers guide V2 added comment about clearing REQPKT before DATAERR_NAKTIMEOUT drivers/usb/musb/musb_host.c | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index e5b6aba..17421d0 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -994,9 +994,15 @@ static void musb_bulk_nak_timeout(struct musb *musb, struct musb_hw_ep *ep, if (is_in) { dma = is_dma_capable() ? ep->rx_channel : NULL; - /* clear nak timeout bit */ + /* + * Need to stop the transaction by clearing REQPKT first + * then the NAK Timeout bit ref MUSBMHDRC USB 2.0 HIGH-SPEED + * DUAL-ROLE CONTROLLER Programmer's Guide, section 9.2.2 + */ rx_csr = musb_readw(epio, MUSB_RXCSR); rx_csr |= MUSB_RXCSR_H_WZC_BITS; + 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