Date: Fri, 7 Nov 2008 18:09:04 +0100 From: Hans Petter Selasky <hselasky@c2i.net> To: freebsd-current@freebsd.org Cc: Jeremy Chadwick <koitsu@freebsd.org>, Eygene Ryabinkin <rea-fbsd@codelabs.ru> Subject: Re: USB4BSD (USB2): Microsoft 4000 keyboard unusable Message-ID: <200811071809.05617.hselasky@c2i.net> In-Reply-To: <20081107090719.GA1287@icarus.home.lan> References: <20081107075232.GA1608@icarus.home.lan> <4bSZ78p2klKnbZ/rhiyIIUK0VNE@qm7gbYKMPO53E/nl%2BD5eD8YyL1A> <20081107090719.GA1287@icarus.home.lan>
next in thread | previous in thread | raw e-mail | index | archive | help
On Friday 07 November 2008, Jeremy Chadwick wrote: > On Fri, Nov 07, 2008 at 11:38:49AM +0300, Eygene Ryabinkin wrote: > > Thu, Nov 06, 2008 at 11:52:32PM -0800, Jeremy Chadwick wrote: > > [...] > > > > > Everything built (csup date: 2008/11/06 ~2200 PST) fine, no issues -- > > > until I noticed my USB keyboard didn't function any longer. > > > > > > During boot0/boot2/loader, the keyboard functions (as expected, re: USB > > > Legacy option is enabled in my BIOS), and the keyboard LEDs are lit as > > > expected. The kernel loads, some drivers initialise, and the LEDs go > > > off. Once the USB2 stack loads, the keyboard LEDs turn back up, but as > > > stated, no keypresses are registered. I was forced to hook up a PS/2 > > > keyboard. > > You are using 64-bit architecture - right? Then you need the following patch to usb2_busdma.c: http://perforce.freebsd.org/chv.cgi?CH=152624 Fix some problems related to busdma: Need to unload DMA maps before re-use! Fix a corner case when loading zero bytes. Affected files ... .. //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#10 edit Differences ... ==== //depot/projects/usb/src/sys/dev/usb2/core/usb2_busdma.c#10 (text+ko) ==== @@ -597,6 +597,12 @@ uptag = pc->tag_parent; /* + * We have to unload the previous loaded DMA + * pages before trying to load a new one! + */ + bus_dmamap_unload(pc->tag, pc->map); + + /* * Try to load memory into DMA. */ err = bus_dmamap_load( @@ -612,6 +618,12 @@ } else { /* + * We have to unload the previous loaded DMA + * pages before trying to load a new one! + */ + bus_dmamap_unload(pc->tag, pc->map); + + /* * Try to load memory into DMA. The callback * will be called in all cases: */ @@ -639,6 +651,10 @@ void usb2_pc_cpu_invalidate(struct usb2_page_cache *pc) { + if (pc->page_offset_end == pc->page_offset_buf) { + /* nothing has been loaded into this page cache! */ + return; + } bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); return; @@ -650,6 +666,10 @@ void usb2_pc_cpu_flush(struct usb2_page_cache *pc) { + if (pc->page_offset_end == pc->page_offset_buf) { + /* nothing has been loaded into this page cache! */ + return; + } bus_dmamap_sync(pc->tag, pc->map, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return; @@ -953,6 +973,12 @@ if (size > 0) { + /* + * We have to unload the previous loaded DMA + * pages before trying to load a new one! + */ + bus_dmamap_unload(pc->tag, pc->map); + /* try to load memory into DMA using using no wait option */ if (bus_dmamap_load(pc->tag, pc->map, pc->buffer, size, NULL, BUS_DMA_NOWAIT)) { @@ -990,6 +1016,10 @@ len = pc->page_offset_end - pc->page_offset_buf; + if (len == 0) { + /* nothing has been loaded into this page cache */ + return; + } bus_dmamap_sync(pc->tag, pc->map, 0, len, BUS_DMASYNC_POSTWRITE | BUS_DMASYNC_POSTREAD); return; @@ -1005,6 +1035,10 @@ len = pc->page_offset_end - pc->page_offset_buf; + if (len == 0) { + /* nothing has been loaded into this page cache */ + return; + } bus_dmamap_sync(pc->tag, pc->map, 0, len, BUS_DMASYNC_PREWRITE | BUS_DMASYNC_PREREAD); return; Best regards HPS
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811071809.05617.hselasky>