diff mbox

[U-Boot,U-Boot,v3] usb: xhci: Fix vendor command error if the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION.

Message ID 1458286013-2518-1-git-send-email-linux.amoon@gmail.com
State Deferred
Delegated to: Marek Vasut
Headers show

Commit Message

Anand Moon March 18, 2016, 7:26 a.m. UTC 
From: Ted Chen <tedchen@realtek.com>

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 <tedchen@realtek.com>
Tested-by: Anand Moon <linux.amoon@gmail.com>
---
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(-)

Comments

Marek Vasut March 18, 2016, 11:29 a.m. UTC | #1 
On 03/18/2016 08:26 AM, Anand Moon wrote:
> From: Ted Chen <tedchen@realtek.com>
> 
> 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 <tedchen@realtek.com>
> Tested-by: Anand Moon <linux.amoon@gmail.com>

Applied, thanks!

Best regards,
Marek Vasut
diff mbox

Patch

diff --git a/drivers/usb/host/xhci.c b/drivers/usb/host/xhci.c
index ca598aa..cb8a04b 100644
--- a/drivers/usb/host/xhci.c
+++ b/drivers/usb/host/xhci.c
@@ -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");