Patch "usb: define USB_SPEED_SUPER_PLUS speed for SuperSpeedPlus USB3.1 devices" has been added to the 3.14-stable tree
Subsystems (2)
This is a note to let you know that I've just added the patch titled
usb: define USB_SPEED_SUPER_PLUS speed for SuperSpeedPlus USB3.1 devices
to the 3.14-stable tree which can be found at:
http://www.kernel.org/git/?p=linux/kernel/git/stable/stable-queue.git;a=summary
The filename of the patch is:
usb-define-usb_speed_super_plus-speed-for-superspeedplus-usb3.1-devices.patch
and it can be found in the queue-3.14 subdirectory.
If you, or anyone else, feels it should not be added to the stable tree, please let <[email protected]> know about it.
Quoted 1 line
From
8a1b2725a60d3267135c15e80984b4406054f650Mon Sep 17 00:00:00 2001
From: Mathias Nyman <[email protected]>
Date: Thu, 10 Dec 2015 09:59:25 +0200
Subject: usb: define USB_SPEED_SUPER_PLUS speed for SuperSpeedPlus USB3.1 devices
From: Mathias Nyman <[email protected]>
commit 8a1b2725a60d3267135c15e80984b4406054f650 upstream.
Add a new USB_SPEED_SUPER_PLUS device speed, and make sure usb core can handle the new speed.
In most cases the behaviour is the same as with USB_SPEED_SUPER SuperSpeed devices. In a few places we add a "Plus" string to inform the user of the new speed.
--- drivers/usb/core/config.c | 3 ++- drivers/usb/core/devices.c | 10 ++++++---- drivers/usb/core/hcd-pci.c | 2 +- drivers/usb/core/hcd.c | 6 +++--- drivers/usb/core/hub.c | 26 +++++++++++++++----------- drivers/usb/core/urb.c | 3 ++- drivers/usb/core/usb.h | 2 +- include/uapi/linux/usb/ch9.h | 1 + 8 files changed, 31 insertions(+), 22 deletions(-)
drivers/usb/core/config.c +2 -1
@@ -192,6 +192,7 @@ static int usb_parse_endpoint(struct devif (usb_endpoint_xfer_int (d)) { i =1 ;switch (to_usb_device (ddev)->speed) { +case USB_SPEED_SUPER_PLUS :case USB_SPEED_SUPER :case USB_SPEED_HIGH :/* Many device manufacturers are using full-speed
@@ -264,7 +265,7 @@ static int usb_parse_endpoint(struct dev }/* Parse a possible SuperSpeed endpoint companion descriptor */ -if (to_usb_device (ddev)->speed ==USB_SPEED_SUPER ) +if (to_usb_device (ddev)->speed >=USB_SPEED_SUPER )usb_parse_ss_endpoint_companion (ddev, cfgno, inum, asnum, endpoint, buffer, size);
drivers/usb/core/devices.c +6 -4
@@ -221,7 +221,7 @@ static char *usb_dump_endpoint_descriptobreak ;case USB_ENDPOINT_XFER_INT : type ="Int." ; -if (speed ==USB_SPEED_HIGH || speed ==USB_SPEED_SUPER ) +if (speed ==USB_SPEED_HIGH || speed >=USB_SPEED_SUPER ) interval =1 << (desc->bInterval -1 );else interval = desc->bInterval;
@@ -230,7 +230,7 @@ static char *usb_dump_endpoint_descriptoreturn start; } interval *= (speed ==USB_SPEED_HIGH || - speed ==USB_SPEED_SUPER ) ?125 :1000 ; + speed >=USB_SPEED_SUPER ) ?125 :1000 ;if (interval %1000 ) unit ='u' ;else {
@@ -322,7 +322,7 @@ static char *usb_dump_config_descriptor(if (start > end)return start; -if (speed ==USB_SPEED_SUPER ) +if (speed >=USB_SPEED_SUPER ) mul =8 ;else mul =2 ;
@@ -534,6 +534,8 @@ static ssize_t usb_device_dump(char __us speed ="480" ;break ;case USB_SPEED_SUPER : speed ="5000" ;break ; +case USB_SPEED_SUPER_PLUS : + speed ="10000" ;break ;default : speed ="??" ; }
@@ -553,7 +555,7 @@ static ssize_t usb_device_dump(char __us/* super/high speed reserves 80%, full/low reserves 90% */ if (usbdev->speed ==USB_SPEED_HIGH || - usbdev->speed ==USB_SPEED_SUPER ) + usbdev->speed >=USB_SPEED_SUPER ) max =800 ;else max =FRAME_TIME_MAX_USECS_ALLOC ;
drivers/usb/core/hcd-pci.c +1 -1
@@ -207,7 +207,7 @@ int usb_hcd_pci_probe(struct pci_dev *de* The xHCI driver has its own irq management * make sure irq setup is not touched for xhci in generic hcd code */ -if ((driver->flags &HCD_MASK ) !=HCD_USB3 ) { +if ((driver->flags &HCD_MASK ) <HCD_USB3 ) {if (!dev->irq) { dev_err(&dev->dev, "Found HC with no IRQ. Check BIOS/PCI %s setup!\n",
drivers/usb/core/hcd.c +3 -3
@@ -1024,7 +1024,7 @@ static int register_root_hub(struct usb_ dev_name(&usb_dev->dev), retval);return (retval <0 ) ? retval : -EMSGSIZE ; } -if (usb_dev->speed ==USB_SPEED_SUPER ) { +if (usb_dev->speed >=USB_SPEED_SUPER ) { retval =usb_get_bos_descriptor (usb_dev);if (retval <0 ) {mutex_unlock (&usb_bus_list_lock);
@@ -2055,7 +2055,7 @@ int usb_alloc_streams(struct usb_interfa hcd =bus_to_hcd (dev->bus);if (!hcd->driver->alloc_streams || !hcd->driver->free_streams)return -EINVAL ; -if (dev->speed !=USB_SPEED_SUPER ) +if (dev->speed <USB_SPEED_SUPER )return -EINVAL ;if (dev->state <USB_STATE_CONFIGURED )return -ENODEV ;
@@ -2093,7 +2093,7 @@ int usb_free_streams(struct usb_interfac dev =interface_to_usbdev (interface); hcd =bus_to_hcd (dev->bus); -if (dev->speed !=USB_SPEED_SUPER ) +if (dev->speed <USB_SPEED_SUPER )return -EINVAL ;/* Streams only apply to bulk endpoints. */
drivers/usb/core/hub.c +15 -11
@@ -297,7 +297,7 @@ static void usb_set_lpm_parameters(strucunsigned int hub_u1_del;unsigned int hub_u2_del; -if (!udev->lpm_capable || udev->speed !=USB_SPEED_SUPER ) +if (!udev->lpm_capable || udev->speed <USB_SPEED_SUPER )return ; hub =usb_hub_to_struct_hub (udev->parent);
@@ -2559,7 +2559,7 @@ static unsigned hub_is_wusb(struct usb_h*/ static bool use_new_scheme (struct usb_device *udev,int retry) { -if (udev->speed ==USB_SPEED_SUPER ) +if (udev->speed >=USB_SPEED_SUPER )return false;return USE_NEW_SCHEME (retry);
@@ -3812,7 +3812,7 @@ int usb_disable_lpm(struct usb_device *ustruct usb_hcd *hcd;if (!udev || !udev->parent || - udev->speed !=USB_SPEED_SUPER || + udev->speed <USB_SPEED_SUPER || !udev->lpm_capable)return 0 ;
@@ -3868,7 +3868,7 @@ void usb_enable_lpm(struct usb_device *ustruct usb_hcd *hcd;if (!udev || !udev->parent || - udev->speed !=USB_SPEED_SUPER || + udev->speed <USB_SPEED_SUPER || !udev->lpm_capable)return ;
@@ -4127,7 +4127,9 @@ hub_port_init (struct usb_hub *hub, stru retval = -ENODEV ; -if (oldspeed !=USB_SPEED_UNKNOWN && oldspeed != udev->speed) { +/* Don't allow speed changes at reset, except usb 3.0 to faster */ +if (oldspeed !=USB_SPEED_UNKNOWN && oldspeed != udev->speed && + !(oldspeed ==USB_SPEED_SUPER && udev->speed > oldspeed)) {dev_dbg (&udev->dev,"device reset changed speed!\n" ); goto fail; }
@@ -4139,6 +4141,7 @@ hub_port_init (struct usb_hub *hub, stru* reported as 0xff in the device descriptor). WUSB1.0[4.8.1]. */ switch (udev->speed) { +case USB_SPEED_SUPER_PLUS :case USB_SPEED_SUPER :case USB_SPEED_WIRELESS :/* fixed at 512 */ udev->ep0.desc.wMaxPacketSize =cpu_to_le16 (512 );
@@ -4165,7 +4168,7 @@ hub_port_init (struct usb_hub *hub, struelse speed =usb_speed_string (udev->speed); -if (udev->speed !=USB_SPEED_SUPER ) +if (udev->speed <USB_SPEED_SUPER ) dev_info(&udev->dev, "%s %s USB device number %d using %s\n", (udev->config) ? "reset" : "new", speed,
@@ -4291,11 +4294,12 @@ hub_port_init (struct usb_hub *hub, stru devnum, retval); goto fail; } -if (udev->speed ==USB_SPEED_SUPER ) { +if (udev->speed >=USB_SPEED_SUPER ) { devnum = udev->devnum;dev_info (&udev->dev, -"%s SuperSpeed USB device number %d using %s\n" , +"%s SuperSpeed%s USB device number %d using %s\n" , (udev->config) ?"reset" :"new" , + (udev->speed ==USB_SPEED_SUPER_PLUS ) ?"Plus" :"" , devnum, udev->bus->controller->driver->name); }
@@ -4337,7 +4341,7 @@ hub_port_init (struct usb_hub *hub, stru* got from those devices show they aren't superspeed devices. Warm * reset the port attached by the devices can fix them. */ -if ((udev->speed ==USB_SPEED_SUPER ) && +if ((udev->speed >=USB_SPEED_SUPER ) && (le16_to_cpu (udev->descriptor.bcdUSB) <0x0300 )) {dev_err (&udev->dev,"got a wrong device descriptor, " "warm reset device\n" );
@@ -4348,7 +4352,7 @@ hub_port_init (struct usb_hub *hub, stru }if (udev->descriptor.bMaxPacketSize0 ==0xff || - udev->speed ==USB_SPEED_SUPER ) + udev->speed >=USB_SPEED_SUPER ) i =512 ;else i = udev->descriptor.bMaxPacketSize0;
@@ -4607,7 +4611,7 @@ static void hub_port_connect_change(stru udev->level = hdev->level +1 ; udev->wusb =hub_is_wusb (hub); -/* Only USB 3.0 devices are connected to SuperSpeed hubs. */ +/* Devices connected to SuperSpeed hubs are USB 3.0 or later */ if (hub_is_superspeed (hub->hdev)) udev->speed =USB_SPEED_SUPER ;else
drivers/usb/core/urb.c +2 -1
@@ -402,7 +402,7 @@ int usb_submit_urb(struct urb *urb, gfp_/* SuperSpeed isoc endpoints have up to 16 bursts of up to * 3 packets each */ -if (dev->speed ==USB_SPEED_SUPER ) { +if (dev->speed >=USB_SPEED_SUPER ) {int burst =1 + ep->ss_ep_comp.bMaxBurst;int mult =USB_SS_MULT (ep->ss_ep_comp.bmAttributes); max *= burst;
@@ -499,6 +499,7 @@ int usb_submit_urb(struct urb *urb, gfp_ }/* too big? */ switch (dev->speed) { +case USB_SPEED_SUPER_PLUS :case USB_SPEED_SUPER :/* units are 125us */ /* Handle up to 2^(16-1) microframes */ if (urb->interval > (1 <<15 ))
drivers/usb/core/usb.h +1 -1
@@ -43,7 +43,7 @@ static inline unsigned usb_get_max_power struct usb_host_config *c) {/* SuperSpeed power is in 8 mA units; others are in 2 mA units */ -unsigned mul = (udev->speed ==USB_SPEED_SUPER ?8 :2 ); +unsigned mul = (udev->speed >=USB_SPEED_SUPER ?8 :2 );return c->desc.bMaxPower * mul; }
include/uapi/linux/usb/ch9.h +1 -0
@@ -913,6 +913,7 @@ enum usb_device_speed {USB_SPEED_HIGH ,/* usb 2.0 */ USB_SPEED_WIRELESS ,/* wireless (usb 2.5) */ USB_SPEED_SUPER ,/* usb 3.0 */ + USB_SPEED_SUPER_PLUS, /* usb 3.1 */ };
Patches currently in stable-queue which might be from [email protected] are
queue-3.14/usb-xhci-fix-panic-if-disconnect.patch queue-3.14/usb-define-usb_speed_super_plus-speed-for-superspeedplus-usb3.1-devices.patch