Attachment 873187 Details for Bug 1220569

[patch] Revised test patch

0001-USB-hub-Workaround-for-buggy-max-packet-size-with-su.patch (text/plain), 1.94 KB, created by Takashi Iwai on 2024-03-03 08:59:41 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Takashi Iwai

Created: 2024-03-03 08:59:41 UTC

Size: 1.94 KB

patch

obsolete

>From: Takashi Iwai <tiwai@suse.de>
>Subject: [PATCH] USB: hub: Workaround for buggy max packet size with super
> speed
>Patch-mainline: Not yet, testing
>References: bsc#1220569
>
>Signed-off-by: Takashi Iwai <tiwai@suse.de>
>
>---
> drivers/usb/core/hub.c | 13 ++++++++++---
> 1 file changed, 10 insertions(+), 3 deletions(-)
>
>diff --git a/drivers/usb/core/hub.c b/drivers/usb/core/hub.c
>index e38a4124f610..64193effc456 100644
>--- a/drivers/usb/core/hub.c
>+++ b/drivers/usb/core/hub.c
>@@ -4830,7 +4830,7 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,
> 	const char		*driver_name;
> 	bool			do_new_scheme;
> 	const bool		initial = !dev_descr;
>-	int			maxp0;
>+	int			maxp0, ep0_maxp;
> 	struct usb_device_descriptor	*buf, *descr;
> 
> 	buf = kmalloc(GET_DESCRIPTOR_BUFSIZE, GFP_NOIO);
>@@ -5070,7 +5070,8 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,
> 		else
> 			i = 0;		/* Invalid */
> 	}
>-	if (usb_endpoint_maxp(&udev->ep0.desc) == i) {
>+	ep0_maxp = usb_endpoint_maxp(&udev->ep0.desc);
>+	if (ep0_maxp == i) {
> 		;	/* Initial ep0 maxpacket guess is right */
> 	} else if ((udev->speed == USB_SPEED_FULL ||
> 				udev->speed == USB_SPEED_HIGH) &&
>@@ -5082,9 +5083,15 @@ hub_port_init(struct usb_hub *hub, struct usb_device *udev, int port1,
> 			dev_warn(&udev->dev, "Using ep0 maxpacket: %d\n", i);
> 		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(i);
> 		usb_ep0_reinit(udev);
>+	} else if (udev->speed >= USB_SPEED_SUPER && initial) {
>+		/* FIXME: should be more restrictive? */
>+		/* Initial guess is wrong; use the descriptor's value */
>+		dev_info(&udev->dev, "Using ep0 maxpacket: %d\n", i);
>+		udev->ep0.desc.wMaxPacketSize = cpu_to_le16(maxp0);
>+		usb_ep0_reinit(udev);
> 	} else {
> 		/* Initial guess is wrong and descriptor's value is invalid */
>-		dev_err(&udev->dev, "Invalid ep0 maxpacket: %d\n", maxp0);
>+		dev_err(&udev->dev, "Invalid ep0 maxpacket: %d, expected %d\n", maxp0, ep0_maxp);
> 		retval = -EMSGSIZE;
> 		goto fail;
> 	}
>-- 
>2.35.3
>

Actions: View | Diff

Attachments on bug 1220569: 873115 | 873131 | 873132 | 873133 | 873134 | 873178 | 873179 | 873180 | 873181 | 873185 | 873186 | 873187 | 873188 | 873189 | 873190