From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756135AbcETRHE (ORCPT ); Fri, 20 May 2016 13:07:04 -0400 Received: from mail1.bemta3.messagelabs.com ([195.245.230.170]:54721 "EHLO mail1.bemta3.messagelabs.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756000AbcETRHA convert rfc822-to-8bit (ORCPT ); Fri, 20 May 2016 13:07:00 -0400 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFtrIKsWRWlGSWpSXmKPExsVyU6aHU1faxT7 c4Ps0Jov/dxaxWjQvXs9mcXnXHDaLRctamS3OrLrFbrFg4yNGBzaPB1P/M3nsn7uG3eP4je1M Hp83yQWwRLFm5iXlVySwZry7eIqlYAFPxZabpQ2MU7m6GLk4hAS2MEp0/97LDuHsZZQ4tWc5c xcjJwebgJnErlfr2EFsEYEIiRMLLjKDFDELvGaUuH9hOhNIQljAV2LX+jNQRX4SzUtvMkPYVh Kn/v9k6WLk4GARUJWYcU0EJMwr4CqxafE2FohlZxklNt17ygqS4BRwk/j/6jgjiM0oICvxpXE 12BxmAXGJW0/mg+2SEBCQWLLnPDOELSrx8vE/VgjbQGLr0n0sELaCxI/eU1A11hL/Htxlgpij I7Fg9yc2CFtbYtnC18wQBwlKnJz5hGUCo9gsJOtmIWmZhaRlFpKWBYwsqxjVi1OLylKLdC30k ooy0zNKchMzc3QNDYz1clOLixPTU3MSk4r1kvNzNzECo5IBCHYwXmh3PsQoycGkJMqrJm4fLs SXlJ9SmZFYnBFfVJqTWnyIUYaDQ0mCV9MZKCdYlJqeWpGWmQNMDzBpCQ4eJRFeK5A0b3FBYm5 xZjpE6hSjopQ47x8noIQASCKjNA+uDZaSLjHKSgnzMgIdIsRTkFqUm1mCKv+KUZyDUUmYVxxk PE9mXgnc9FdAi5mAFt8SswFZXJKIkJJqYAyayBjMz+xQrnuz8T7fhLuvlJJWxf/a9Tg/8Li4z D3etz2qAVdN4l0fpGe8WnD9fOPzC573Xt37FMPWJmDXO+Okn27YxFcuW1bzfAw892/dW+0JhV W/VkguWTvP7Zya+Mvmu0tmGVy+b5DFm/zkTsj7xHOhc4/b+Wa87rQTl/eP83ngaSTFe1qJpTg j0VCLuag4EQBF8YuqRAMAAA== X-Env-Sender: andrew.goodbody@cambrionix.com X-Msg-Ref: server-6.tower-140.messagelabs.com!1463763994!32908755!1 X-Originating-IP: [217.28.140.9] X-StarScan-Received: X-StarScan-Version: 8.34; banners=-,-,- X-VirusChecked: Checked From: Andrew Goodbody To: Sergei Shtylyov , "b-liu@ti.com" CC: "gregkh@linuxfoundation.org" , "linux-usb@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "stable@vger.kernel.org" Subject: RE: [PATCH 2/2] usb: musb: Stop bulk endpoint while queue is rotated Thread-Topic: [PATCH 2/2] usb: musb: Stop bulk endpoint while queue is rotated Thread-Index: AQHRsqdFFRyY/KzTlE+UQpildgn8+5/B8S0AgAAcrqA= Date: Fri, 20 May 2016 17:06:33 +0000 Message-ID: <7a4fb42ac94140d7a5d34eb1c0b5934b@THHSTE15D2BE2.hs20.net> References: <1463755902-12922-1-git-send-email-andrew.goodbody@cambrionix.com> <1463755902-12922-3-git-send-email-andrew.goodbody@cambrionix.com> In-Reply-To: Accept-Language: en-GB, en-US Content-Language: en-US X-MS-Has-Attach: X-MS-TNEF-Correlator: x-ms-exchange-transport-fromentityheader: Hosted x-originating-ip: [46.17.166.30] x-exclaimer-md-config: 266e7a57-cddd-49fd-bdea-19bca6d40303 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 8BIT MIME-Version: 1.0 Sender: linux-kernel-owner@vger.kernel.org List-ID: X-Mailing-List: linux-kernel@vger.kernel.org > From: Sergei Shtylyov [mailto:sergei.shtylyov@cogentembedded.com] > On 05/20/2016 05:51 PM, Andrew Goodbody wrote: > > > 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 > > --- > > drivers/usb/musb/musb_host.c | 2 ++ > > 1 file changed, 2 insertions(+) > > > > diff --git a/drivers/usb/musb/musb_host.c > > b/drivers/usb/musb/musb_host.c index 30e0d65..777ff30 100644 > > --- a/drivers/usb/musb/musb_host.c > > +++ b/drivers/usb/musb/musb_host.c > > @@ -999,6 +999,8 @@ 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; > > + 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); > > Can we not clear both in one write? Section 16.3.8.2.2.1.2 of the TRM says to clear REQPKT before DATAERR_NAKTIMEOUT. Andrew > [...] > > MBR, Sergei