Skip to contentSkip to conversation

Patch "USB: gadget: dummy_hcd: fix hub-descriptor removable fields" has been added to the 4.11-stable tree

PATCH [email protected] 1 participant 1 message Jun 18, 2017

Subsystems (2)
lore
Share & tools
lore

[email protected]

author maintainer Applied
#0 lore raw

This is a note to let you know that I've just added the patch titled

USB: gadget: dummy_hcd: fix hub-descriptor removable fields

to the 4.11-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-gadget-dummy_hcd-fix-hub-descriptor-removable-fields.patch
and it can be found in the queue-4.11 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 d81182ce30dbd497a1e7047d7fda2af040347790 Mon Sep 17 00:00:00 2001

From: Johan Hovold <[email protected]>
Date: Wed, 10 May 2017 18:18:25 +0200
Subject: USB: gadget: dummy_hcd: fix hub-descriptor removable fields

From: Johan Hovold <[email protected]>

commit d81182ce30dbd497a1e7047d7fda2af040347790 upstream.

Flag the first and only port as removable while also leaving the remaining bits (including the reserved bit zero) unset in accordance with the specifications:

"Within a byte, if no port exists for a given location, the bit field representing the port characteristics shall be 0."

Also add a comment marking the legacy PortPwrCtrlMask field.

Fixes 1cd8fd2887e1 ("usb: gadget: dummy_hcd: add SuperSpeed support")
Fixes 1da177e4c3f4 ("Linux-2.6.12-rc2")
Cc Tatyana Brokhman <[email protected]>
---
 drivers/usb/gadget/udc/dummy_hcd.c |    6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)
drivers/usb/gadget/udc/dummy_hcd.c +3 -3
@@ -2008,7 +2008,7 @@ ss_hub_descriptor(struct usb_hub_descrip
 			HUB_CHAR_COMMON_OCPM);
 	desc->bNbrPorts = 1;
 	desc->u.ss.bHubHdrDecLat = 0x04; /* Worst case: 0.4 micro sec*/
-	desc->u.ss.DeviceRemovable = 0xffff;
+	desc->u.ss.DeviceRemovable = 0;
 }
 
 static inline void hub_descriptor(struct usb_hub_descriptor *desc)
@@ -2020,8 +2020,8 @@ static inline void hub_descriptor(struct
 			HUB_CHAR_INDV_PORT_LPSM |
 			HUB_CHAR_COMMON_OCPM);
 	desc->bNbrPorts = 1;
-	desc->u.hs.DeviceRemovable[0] = 0xff;
-	desc->u.hs.DeviceRemovable[1] = 0xff;
+	desc->u.hs.DeviceRemovable[0] = 0;
+	desc->u.hs.DeviceRemovable[1] = 0xff;	/* PortPwrCtrlMask */
 }
 
 static int dummy_hub_control(

Patches currently in stable-queue which might be from [email protected] are

queue-4.11/alsa-usb-audio-fix-amanero-combo384-quirk-on-big-endian-hosts.patch queue-4.11/usb-usbip-fix-nonconforming-hub-descriptor.patch queue-4.11/usb-gadget-dummy_hcd-fix-hub-descriptor-removable-fields.patch queue-4.11/usb-hub-fix-ss-max-number-of-ports.patch