From inaky@linux.intel.com Fri Aug 25 19:38:04 2006 Message-Id: <20060826023759.214746000@sodium.jf.intel.com> Date: Fri, 25 Aug 2006 19:35:30 -0700 From: Inaky Perez-Gonzalez To: greg@kroah.com Cc: linux-usb-devel@lists.sourceforge.net, David Brownell , Alan Stern , inaky@linux.intel.com, Inaky Perez-Gonzalez Subject: [patch 3/4] wusb: handle wusb device ep0 speed settings Content-Disposition: inline; filename=wusb-handle-wusb-device-ep0-speed-settings.patch This patch teaches the USB stack handling of WUSB devices (those whose speed is USB_SPEED_VARIABLE). For these devices, we need to set ep0's maxpacketsize to 512 (even though the device descriptor reports it as 0xff). New code being pushed to linuxuwb.org requires this patch to connect WUSB devices. Signed-off-by: Inaky Perez-Gonzalez Signed-off-by: Greg Kroah-Hartman --- drivers/usb/core/hub.c | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) --- gregkh-2.6.orig/drivers/usb/core/hub.c +++ gregkh-2.6/drivers/usb/core/hub.c @@ -2060,8 +2060,13 @@ hub_port_init (struct usb_hub *hub, stru /* USB 2.0 section 5.5.3 talks about ep0 maxpacket ... * it's fixed size except for full speed devices. + * For Wireless USB devices, ep0 max packet is always 512 (tho + * reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. */ switch (udev->speed) { + case USB_SPEED_VARIABLE: /* fixed at 512 */ + udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(512); + break; case USB_SPEED_HIGH: /* fixed at 64 */ udev->ep0.desc.wMaxPacketSize = __constant_cpu_to_le16(64); break; @@ -2131,6 +2136,8 @@ hub_port_init (struct usb_hub *hub, stru * down tremendously by NAKing the unexpectedly * early status stage. Also, retry on all errors; * some devices are flakey. + * 255 is for WUSB devices, we actually need to use 512. + * WUSB1.0[4.8.1]. */ for (j = 0; j < 3; ++j) { buf->bMaxPacketSize0 = 0; @@ -2140,7 +2147,7 @@ hub_port_init (struct usb_hub *hub, stru buf, GET_DESCRIPTOR_BUFSIZE, (i ? USB_CTRL_GET_TIMEOUT : 1000)); switch (buf->bMaxPacketSize0) { - case 8: case 16: case 32: case 64: + case 8: case 16: case 32: case 64: case 255: if (buf->bDescriptorType == USB_DT_DEVICE) { r = 0; @@ -2214,7 +2221,8 @@ hub_port_init (struct usb_hub *hub, stru if (retval) goto fail; - i = udev->descriptor.bMaxPacketSize0; + i = udev->descriptor.bMaxPacketSize0 == 0xff? + 512 : udev->descriptor.bMaxPacketSize0; if (le16_to_cpu(udev->ep0.desc.wMaxPacketSize) != i) { if (udev->speed != USB_SPEED_FULL || !(i == 8 || i == 16 || i == 32 || i == 64)) {