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

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

[Ted Chen]

Add a condition of set_address and set_configuration to check
if the request is standardized.

Signed-off-by: Ted Chen <tedchen@realtek.com>
---
 drivers/usb/host/xhci.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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");
-- 
1.7.9.5

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

[Ted Chen]

Add a condition of set_address and set_configuration to check
if the request is standardized.

Signed-off-by: Ted Chen <tedchen@realtek.com>
---
 drivers/usb/host/xhci.c |    6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

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");
-- 
1.7.9.5

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

[Anand Moon]

Hi Ted,

On 25 November 2015 at 11:27, Ted Chen <tedchen@realtek.com> wrote:
> Add a condition of set_address and set_configuration to check
> if the request is standardized.
>
> Signed-off-by: Ted Chen <tedchen@realtek.com>
> ---
>  drivers/usb/host/xhci.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
>
> 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");
> --
> 1.7.9.5
>

Tested on Odroid-XU4 with Ethernet USB3.0 RT8153-VB.

Tested-by: Anand Moon <linux.amoon@gmail.com>
Reviewed-by: Anand Moon <linux.amoon@gmail.com>

-Anand Moon

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

[Marek Vasut]

On Wednesday, November 25, 2015 at 06:57:48 AM, Ted Chen wrote:
> Add a condition of set_address and set_configuration to check
> if the request is standardized.
> 
> Signed-off-by: Ted Chen <tedchen@realtek.com>
> ---
>  drivers/usb/host/xhci.c |    6 ++++--
>  1 file changed, 4 insertions(+), 2 deletions(-)
> 
> 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);
> 

Hi!
What do you say we reorder the check a little:

if ((setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
	if (setup->request == USB_REQ_SET_ADDRESS)
		return xhci_address_device(udev, root_portnr);

	if (setup->request == USB_REQ_SET_CONFIGURATION)
		...
}

Also, I suspect this sort of fix needs to be applied to at least dwc3 ep0.c,
r8a66597-hcd.c and musb_hcd.c as well.

Paging Hans so he can share his visdom too :)

> -	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");

Best regards,
Marek Vasut

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

[Joe Culler]

Hi Anand,

I have a odroid-xu4, but it doesn't detect the rtl8153:

U-Boot 2016.01-rc1-00441-g75507d5-dirty (Dec 07 2015 - 15:46:09 +0800) for
ODROID-XU3

CPU:   Exynos5422 @ 800 MHz
Model: Odroid XU3 based on EXYNOS5422
Board: Odroid XU3 based on EXYNOS5422
Type:  xu4
DRAM:  2 GiB
__of_translate_address: Bad cell count for gpx0
MMC:   EXYNOS DWMMC: 0, EXYNOS DWMMC: 1
*** Warning - bad CRC, using default environment

In:    serial
Out:   serial
Err:   serial
Net:   No ethernet found.
Hit any key to stop autoboot:  0
switch to partitions #0, OK
mmc0 is current device
Scanning mmc 0:1...
starting USB...
USB0:   USB EHCI 1.00
USB1:   Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.00
USB2:   Register 2000140 NbrPorts 2
Starting the controller
USB XHCI 1.00
scanning bus 0 for devices... 1 USB Device(s) found
scanning bus 1 for devices... 2 USB Device(s) found
scanning bus 2 for devices... 2 USB Device(s) found
       scanning usb for ethernet devices... Setup ERROR: address device
command for slot 1.
Unknown version 0x0000
Unknown Device
0 Ethernet Device(s) found
No ethernet found.


could you send me your odroid-xu3_defconfig?  Thanks.
BTW, I added "#define CONFIG_USB_ETHER_RTL8152" to
include/configs/exynos5-common.h

Regards,
Joe

On Wed, Nov 25, 2015 at 5:09 PM, Anand Moon <linux.amoon@gmail.com> wrote:

> Hi Ted,
>
> On 25 November 2015 at 11:27, Ted Chen <tedchen@realtek.com> wrote:
> > Add a condition of set_address and set_configuration to check
> > if the request is standardized.
> >
> > Signed-off-by: Ted Chen <tedchen@realtek.com>
> > ---
> >  drivers/usb/host/xhci.c |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> >
> > 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");
> > --
> > 1.7.9.5
> >
>
> Tested on Odroid-XU4 with Ethernet USB3.0 RT8153-VB.
>
> Tested-by: Anand Moon <linux.amoon@gmail.com>
> Reviewed-by: Anand Moon <linux.amoon@gmail.com>
>
> -Anand Moon
> _______________________________________________
> U-Boot mailing list
> U-Boot at lists.denx.de
> http://lists.denx.de/mailman/listinfo/u-boot
>

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

[Joe Culler]

Oops, please ignore this message.  The rtl8153 is detected :)

On Mon, Dec 7, 2015 at 4:16 PM, Joe Culler <joe.culler@gmail.com> wrote:

> Hi Anand,
>
> I have a odroid-xu4, but it doesn't detect the rtl8153:
>
> U-Boot 2016.01-rc1-00441-g75507d5-dirty (Dec 07 2015 - 15:46:09 +0800) for
> ODROID-XU3
>
> CPU:   Exynos5422 @ 800 MHz
> Model: Odroid XU3 based on EXYNOS5422
> Board: Odroid XU3 based on EXYNOS5422
> Type:  xu4
> DRAM:  2 GiB
> __of_translate_address: Bad cell count for gpx0
> MMC:   EXYNOS DWMMC: 0, EXYNOS DWMMC: 1
> *** Warning - bad CRC, using default environment
>
> In:    serial
> Out:   serial
> Err:   serial
> Net:   No ethernet found.
> Hit any key to stop autoboot:  0
> switch to partitions #0, OK
> mmc0 is current device
> Scanning mmc 0:1...
> starting USB...
> USB0:   USB EHCI 1.00
> USB1:   Register 2000140 NbrPorts 2
> Starting the controller
> USB XHCI 1.00
> USB2:   Register 2000140 NbrPorts 2
> Starting the controller
> USB XHCI 1.00
> scanning bus 0 for devices... 1 USB Device(s) found
> scanning bus 1 for devices... 2 USB Device(s) found
> scanning bus 2 for devices... 2 USB Device(s) found
>        scanning usb for ethernet devices... Setup ERROR: address device
> command for slot 1.
> Unknown version 0x0000
> Unknown Device
> 0 Ethernet Device(s) found
> No ethernet found.
>
>
> could you send me your odroid-xu3_defconfig?  Thanks.
> BTW, I added "#define CONFIG_USB_ETHER_RTL8152" to
> include/configs/exynos5-common.h
>
> Regards,
> Joe
>
>
> On Wed, Nov 25, 2015 at 5:09 PM, Anand Moon <linux.amoon@gmail.com> wrote:
>
>> Hi Ted,
>>
>> On 25 November 2015 at 11:27, Ted Chen <tedchen@realtek.com> wrote:
>> > Add a condition of set_address and set_configuration to check
>> > if the request is standardized.
>> >
>> > Signed-off-by: Ted Chen <tedchen@realtek.com>
>> > ---
>> >  drivers/usb/host/xhci.c |    6 ++++--
>> >  1 file changed, 4 insertions(+), 2 deletions(-)
>> >
>> > 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");
>> > --
>> > 1.7.9.5
>> >
>>
>> Tested on Odroid-XU4 with Ethernet USB3.0 RT8153-VB.
>>
>> Tested-by: Anand Moon <linux.amoon@gmail.com>
>> Reviewed-by: Anand Moon <linux.amoon@gmail.com>
>>
>> -Anand Moon
>> _______________________________________________
>> U-Boot mailing list
>> U-Boot at lists.denx.de
>> http://lists.denx.de/mailman/listinfo/u-boot
>>
>
>

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

[Ted]

Hi Marek, 

> -----Original Message-----
> From: Marek Vasut [mailto:marex at denx.de] 
> Sent: Thursday, November 26, 2015 9:25 AM
> To: Ted
> Cc: swarren at nvidia.com; u-boot at lists.denx.de; 
> linux.amoon at gmail.com; Hans de Goede
> Subject: Re: [PATCH] usb: xhci: Fix vendor command error if 
> the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION.
> 
> On Wednesday, November 25, 2015 at 06:57:48 AM, Ted Chen wrote:
> > Add a condition of set_address and set_configuration to 
> check if the 
> > request is standardized.
> > 
> > Signed-off-by: Ted Chen <tedchen@realtek.com>
> > ---
> >  drivers/usb/host/xhci.c |    6 ++++--
> >  1 file changed, 4 insertions(+), 2 deletions(-)
> > 
> > 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);
> > 
> 
> Hi!
> What do you say we reorder the check a little:
> 
> if ((setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
> 	if (setup->request == USB_REQ_SET_ADDRESS)
> 		return xhci_address_device(udev, root_portnr);
> 
> 	if (setup->request == USB_REQ_SET_CONFIGURATION)
> 		...
> }
> 
> Also, I suspect this sort of fix needs to be applied to at 
> least dwc3 ep0.c, r8a66597-hcd.c and musb_hcd.c as well.
> 

I don't have another board in my hand, so I can't verify the other xhci host controller.

But I have confirmed this patch in xhci.c actually can fix errors while  the the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION in USB vendor command.

> Paging Hans so he can share his visdom too :)

Hi Hans,

Do you have any comments?

Thanks

> 
> > -	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");
> 
> Best regards,
> Marek Vasut
> 
> ------Please consider the environment before printing this e-mail.
> 

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

[Marek Vasut]

On Monday, January 25, 2016 at 12:11:59 PM, Ted wrote:
> Hi Marek,

Hi Ted,

> > -----Original Message-----
> > From: Marek Vasut [mailto:marex at denx.de]
> > Sent: Thursday, November 26, 2015 9:25 AM
> > To: Ted
> > Cc: swarren at nvidia.com; u-boot at lists.denx.de;
> > linux.amoon at gmail.com; Hans de Goede
> > Subject: Re: [PATCH] usb: xhci: Fix vendor command error if
> > the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION.
> > 
> > On Wednesday, November 25, 2015 at 06:57:48 AM, Ted Chen wrote:
> > > Add a condition of set_address and set_configuration to
> > 
> > check if the
> > 
> > > request is standardized.
> > > 
> > > Signed-off-by: Ted Chen <tedchen@realtek.com>
> > > ---
> > > 
> > >  drivers/usb/host/xhci.c |    6 ++++--
> > >  1 file changed, 4 insertions(+), 2 deletions(-)
> > > 
> > > 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);
> > 
> > Hi!
> > What do you say we reorder the check a little:
> > 
> > if ((setup->requesttype & USB_TYPE_MASK) == USB_TYPE_STANDARD) {
> > 
> > 	if (setup->request == USB_REQ_SET_ADDRESS)
> > 	
> > 		return xhci_address_device(udev, root_portnr);
> > 	
> > 	if (setup->request == USB_REQ_SET_CONFIGURATION)
> > 	
> > 		...
> > 
> > }
> > 
> > Also, I suspect this sort of fix needs to be applied to at
> > least dwc3 ep0.c, r8a66597-hcd.c and musb_hcd.c as well.
> 
> I don't have another board in my hand, so I can't verify the other xhci
> host controller.

That's fine, just fixing this problem everywhere is enough and the people
who have the controller can test it themselves.

> But I have confirmed this patch in xhci.c actually can fix errors while 
> the the request type is USB_REQ_SET_ADDRESS or USB_REQ_SET_CONFIGURATION
> in USB vendor command.

Excellent.

> > Paging Hans so he can share his visdom too :)
> 
> Hi Hans,
> 
> Do you have any comments?
> 
> Thanks

Thanks!

> > > -	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");
> > 
> > Best regards,
> > Marek Vasut
> > 
> > ------Please consider the environment before printing this e-mail.