--- drivers/usb/core/devices.c

+++ drivers/usb/core/devices.c

@@ -65,8 +65,8 @@

#define ALLOW_SERIAL_NUMBER

static const char *format_topo =

-/* T: Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=ddd MxCh=dd */

-"\nT: Bus=%2.2d Lev=%2.2d Prnt=%2.2d Port=%2.2d Cnt=%2.2d Dev#=%3d Spd=%3s MxCh=%2d\n";

+/* T: Bus=dd Lev=dd Prnt=dd Port=dd Cnt=dd Dev#=ddd Spd=dddd MxCh=dd */

+"\nT: Bus=%2.2d Lev=%2.2d Prnt=%2.2d Port=%2.2d Cnt=%2.2d Dev#=%3d Spd=%-4s MxCh=%2d\n";

static const char *format_string_manufacturer =

/* S: Manufacturer=xxxx */

@@ -211,7 +211,7 @@ static char *usb_dump_endpoint_descripto

break;

case USB_ENDPOINT_XFER_INT:

type = "Int.";

- if (speed == USB_SPEED_HIGH)

+ if (speed == USB_SPEED_HIGH || speed == USB_SPEED_SUPER)

interval = 1 << (desc->bInterval - 1);

else

interval = desc->bInterval;

@@ -219,7 +219,8 @@ static char *usb_dump_endpoint_descripto

default: /* "can't happen" */

return start;

}

- interval *= (speed == USB_SPEED_HIGH) ? 125 : 1000;

+ interval *= (speed == USB_SPEED_HIGH ||

+ speed == USB_SPEED_SUPER) ? 125 : 1000;

if (interval % 1000)

unit = 'u';

else {

@@ -509,11 +510,13 @@ static ssize_t usb_device_dump(char __us

speed = "1.5"; break;

case USB_SPEED_UNKNOWN: /* usb 1.1 root hub code */

case USB_SPEED_FULL:

- speed = "12 "; break;

+ speed = "12"; break;

case USB_SPEED_HIGH:

speed = "480"; break;

+ case USB_SPEED_SUPER:

+ speed = "5000"; break;

default:

- speed = "?? ";

+ speed = "??";

}

data_end = pages_start + sprintf(pages_start, format_topo,

bus->busnum, level, parent_devnum,

@@ -529,8 +532,9 @@ static ssize_t usb_device_dump(char __us

if (level == 0) {

int max;

- /* high speed reserves 80%, full/low reserves 90% */

- if (usbdev->speed == USB_SPEED_HIGH)

+ /* super/high speed reserves 80%, full/low reserves 90% */

+ if (usbdev->speed == USB_SPEED_HIGH ||

+ usbdev->speed == USB_SPEED_SUPER)

max = 800;

else

max = FRAME_TIME_MAX_USECS_ALLOC;