Hi, On Thu, Dec 15, 2011 at 08:50:47PM +0300, Sergei Shtylyov wrote: > Hello. > > On 12/15/2011 05:57 PM, Felipe Balbi wrote: > > >A couple more fixes for 3.2 kernel have come up. > >Please pull for for-greg branch to receive both fixes. The combined > >diff is small enough to append at the end of this mail. > > >I have checked that it merged cleanly and result compiles fine. > > >The following changes since commit 02a551c9755b799579e0a093bcc99b80b4dc1453: > > > USB: option: Removing one bogus and adding some new Huawei combinations (2011-12-13 09:46:01 -0800) > > >are available in the git repository at: > > git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git for-greg > > >Ajay Kumar Gupta (1): > > usb: musb: fix reset issue with full speed device > > I never saw this patch on the list, and it's not archived either... He did send to the list, but for some reason it didn't get anywhere. My reply to his mail reached the list: http://marc.info/?l=linux-usb&m=132384968328916&w=2 Original mail (with full headers) below for reference, see that it was sent To linux-usb@xxxxxxxxxxxxxxx 8<------------------- cut here --------------------------- From a0393629@psplinux060 Tue Dec 13 07:03:02 2011 Delivered-To: balbi@xxxxxxxx Received: by 10.147.167.16 with SMTP id u16cs67508yao; Mon, 12 Dec 2011 21:03:04 -0800 (PST) Received: by 10.68.212.200 with SMTP id nm8mr3246293pbc.28.1323752583010; Mon, 12 Dec 2011 21:03:03 -0800 (PST) Return-Path: <a0393629@psplinux060> Received: from psmtp.com ([74.125.149.112]) by mx.google.com with SMTP id j1si815929pbi.129.2011.12.12.21.03.02 (version=TLSv1/SSLv3 cipher=OTHER); Mon, 12 Dec 2011 21:03:02 -0800 (PST) Received-SPF: neutral (google.com: 192.94.94.41 is neither permitted nor denied by best guess record for domain of a0393629@psplinux060) client-ip=192.94.94.41; Authentication-Results: mx.google.com; spf=neutral (google.com: 192.94.94.41 is neither permitted nor denied by best guess record for domain of a0393629@psplinux060) smtp.mail=a0393629@psplinux060 Received: from bear.ext.ti.com ([192.94.94.41]) (using TLSv1) by na3sys009amx228.postini.com ([74.125.148.10]) with SMTP; Tue, 13 Dec 2011 05:03:02 GMT Received: from dbdp31.itg.ti.com ([172.24.170.98]) by bear.ext.ti.com (8.13.7/8.13.7) with ESMTP id pBD52xRS011674 for <balbi@xxxxxxxx>; Mon, 12 Dec 2011 23:03:00 -0600 Received: from psplinux060 (psplinux060.india.ti.com [10.24.97.42]) by dbdp31.itg.ti.com (8.13.8/8.13.8) with ESMTP id pBD52uhK015455; Tue, 13 Dec 2011 10:32:58 +0530 (IST) Received: from a0393629 by psplinux060 with local (Exim 4.71) (envelope-from <a0393629@psplinux060>) id 1RaKW0-00033V-PP; Tue, 13 Dec 2011 10:32:56 +0530 From: Ajay Kumar Gupta <ajay.gupta@xxxxxx> To: linux-usb@xxxxxxxxxxxxxxx Cc: balbi@xxxxxx, Ajay Kumar Gupta <ajay.gupta@xxxxxx> Subject: [PATCH] usb: musb: fix reset issue with full speed device Date: Tue, 13 Dec 2011 10:32:42 +0530 Message-Id: <1323752562-11694-1-git-send-email-ajay.gupta@xxxxxx> X-Mailer: git-send-email 1.7.0.4 X-CM: TI mail servers Status: RO X-Status: A Content-Length: 1031 Lines: 30 TXMAXP register is not getting programmed correctly for a full speed device as can_bulk_split() have been removed by "0662481: usb: musb: disable double buffering when it's broken" patch. Adding back the case for can_bulk_split() to fix the reset message seen with a full speed stick. Signed-off-by: Ajay Kumar Gupta <ajay.gupta@xxxxxx> --- drivers/usb/musb/musb_host.c | 4 ++++ 1 files changed, 4 insertions(+), 0 deletions(-) diff --git a/drivers/usb/musb/musb_host.c b/drivers/usb/musb/musb_host.c index 60ddba8..79cb0af 100644 --- a/drivers/usb/musb/musb_host.c +++ b/drivers/usb/musb/musb_host.c @@ -774,6 +774,10 @@ static void musb_ep_program(struct musb *musb, u8 epnum, if (musb->double_buffer_not_ok) musb_writew(epio, MUSB_TXMAXP, hw_ep->max_packet_sz_tx); + else if (can_bulk_split(musb, qh->type)) + musb_writew(epio, MUSB_TXMAXP, packet_sz + | ((hw_ep->max_packet_sz_tx / + packet_sz) - 1) << 11); else musb_writew(epio, MUSB_TXMAXP, qh->maxpacket | -- 1.7.0.4 -- balbi
Attachment:
signature.asc
Description: Digital signature
