usb: xhci: Fix vendor command error if the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION.

PATCH New Anand Moon 2 participants 2 messages Mar 18, 2016

Subsystems (2)

USB USB xHCI driver

lore

Share & tools

lore

Anand Moon

author

2016-03-18 07:26 UTC #0 lore raw

PATCH v3 1/1 usb: xhci: Fix vendor command error if the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION.

From: Ted Chen <[email protected]>

Add test into xhci_submit_control_message for usb requesttype in USB vendor request being of standardized type. This fixes detection of certain USB fixes, for example Ethernet, USB 3.0 port. Non standardized requesttype in USB vendor request will be ignored.

Signed-off-by Ted Chen <[email protected]>

Tested-by Anand Moon <[email protected]>

---
Changes logs:
v3: Fixed the commit message and bad format of the patch.
core changes none.
v2: Resend this patch it some how got missed.
core changes none.

Tested on Odroid-XU4 with R8153 Ethernet port.

---
 drivers/usb/host/xhci.c | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

drivers/usb/host/xhci.c +4 -2

index ca598aa..cb8a04b 100644
@@ -941,10 +941,12 @@ static int _xhci_submit_control_msg(struct usb_device *udev, unsigned long pipe,
 	if (usb_pipedevice(pipe) == ctrl->rootdev)
 		return xhci_submit_root(udev, pipe, buffer, setup);
 
-	if (setup->request == USB_REQ_SET_ADDRESS)
+	if (setup->request == USB_REQ_SET_ADDRESS &&
+	   (setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD)
 		return xhci_address_device(udev, root_portnr);
 
-	if (setup->request == USB_REQ_SET_CONFIGURATION) {
+	if (setup->request == USB_REQ_SET_CONFIGURATION &&
+	   (setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
 		ret = xhci_set_configuration(udev);
 		if (ret) {
 			puts("Failed to configure xHCI endpoint\n");

Signature · 1 line

1.9.1

Marek Vasut

Applied

2016-03-18 11:29 UTC #1 lore raw

PATCH v3 1/1 usb: xhci: Fix vendor command error if the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION.

Quoted 9 lines · Anand Moon

From: Ted Chen <[email protected]>
Add test into xhci_submit_control_message for usb requesttype in USB vendor request being of standardized type. This fixes detection of certain USB fixes, for example Ethernet, USB 3.0 port. Non standardized requesttype in USB vendor request will be ignored.
Signed-off-by Ted Chen <[email protected]>
Tested-by Anand Moon <[email protected]>

Applied, thanks!

Best regards,
Marek Vasut