| Message ID | 20231117091808.534882-1-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,M:raspi,v2] UBUNTU: SAUCE: Revert "usb: misc: onboard-hub: add support for Microchip USB2514B USB 2.0 hub" | expand |
On 11/17/23 2:18 AM, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/2039786 > > This reverts commit 43993626de00f8faea2cf4d54aaea8f607331fcf. > > When the driver loads, all attached USB devices are reconnected, which > breaks boot from USB. Temporarily revert support for this hub until > a proper fix is available, it's not needed on Pi anyways. > > [juergh: Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit.] > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > > --- > v2: > - Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit. > --- > drivers/usb/misc/onboard_usb_hub.c | 1 - > drivers/usb/misc/onboard_usb_hub.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c > index 83f14ca1d38e..ff15302e0f43 100644 > --- a/drivers/usb/misc/onboard_usb_hub.c > +++ b/drivers/usb/misc/onboard_usb_hub.c > @@ -409,7 +409,6 @@ static void onboard_hub_usbdev_disconnect(struct usb_device *udev) > static const struct usb_device_id onboard_hub_id_table[] = { > { USB_DEVICE(VENDOR_ID_GENESYS, 0x0608) }, /* Genesys Logic GL850G USB 2.0 */ > { USB_DEVICE(VENDOR_ID_GENESYS, 0x0610) }, /* Genesys Logic GL852G USB 2.0 */ > - { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */ > { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */ > { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */ > { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */ > diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h > index aca5f50eb0da..b96a26a9f746 100644 > --- a/drivers/usb/misc/onboard_usb_hub.h > +++ b/drivers/usb/misc/onboard_usb_hub.h > @@ -35,7 +35,6 @@ static const struct onboard_hub_pdata vialab_vl817_data = { > }; > > static const struct of_device_id onboard_hub_match[] = { > - { .compatible = "usb424,2514", .data = µchip_usb424_data, }, > { .compatible = "usb424,2517", .data = µchip_usb424_data, }, > { .compatible = "usb451,8140", .data = &ti_tusb8041_data, }, > { .compatible = "usb451,8142", .data = &ti_tusb8041_data, }, Acked-by: Tim Gardner <tim.gardner@canonical.com>
LGTM Acked-by: Jacob Martin <jacob.martin@canonical.com> On 11/17/23 3:18 AM, Juerg Haefliger wrote: > BugLink: https://bugs.launchpad.net/bugs/2039786 > > This reverts commit 43993626de00f8faea2cf4d54aaea8f607331fcf. > > When the driver loads, all attached USB devices are reconnected, which > breaks boot from USB. Temporarily revert support for this hub until > a proper fix is available, it's not needed on Pi anyways. > > [juergh: Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit.] > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > > --- > v2: > - Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit. > --- > drivers/usb/misc/onboard_usb_hub.c | 1 - > drivers/usb/misc/onboard_usb_hub.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c > index 83f14ca1d38e..ff15302e0f43 100644 > --- a/drivers/usb/misc/onboard_usb_hub.c > +++ b/drivers/usb/misc/onboard_usb_hub.c > @@ -409,7 +409,6 @@ static void onboard_hub_usbdev_disconnect(struct usb_device *udev) > static const struct usb_device_id onboard_hub_id_table[] = { > { USB_DEVICE(VENDOR_ID_GENESYS, 0x0608) }, /* Genesys Logic GL850G USB 2.0 */ > { USB_DEVICE(VENDOR_ID_GENESYS, 0x0610) }, /* Genesys Logic GL852G USB 2.0 */ > - { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */ > { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */ > { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */ > { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */ > diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h > index aca5f50eb0da..b96a26a9f746 100644 > --- a/drivers/usb/misc/onboard_usb_hub.h > +++ b/drivers/usb/misc/onboard_usb_hub.h > @@ -35,7 +35,6 @@ static const struct onboard_hub_pdata vialab_vl817_data = { > }; > > static const struct of_device_id onboard_hub_match[] = { > - { .compatible = "usb424,2514", .data = µchip_usb424_data, }, > { .compatible = "usb424,2517", .data = µchip_usb424_data, }, > { .compatible = "usb451,8140", .data = &ti_tusb8041_data, }, > { .compatible = "usb451,8142", .data = &ti_tusb8041_data, },
Applied to Mantic linux-raspi master-next branch. ...Juerg > BugLink: https://bugs.launchpad.net/bugs/2039786 > > This reverts commit 43993626de00f8faea2cf4d54aaea8f607331fcf. > > When the driver loads, all attached USB devices are reconnected, which > breaks boot from USB. Temporarily revert support for this hub until > a proper fix is available, it's not needed on Pi anyways. > > [juergh: Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit.] > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > > --- > v2: > - Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit. > --- > drivers/usb/misc/onboard_usb_hub.c | 1 - > drivers/usb/misc/onboard_usb_hub.h | 1 - > 2 files changed, 2 deletions(-) > > diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c > index 83f14ca1d38e..ff15302e0f43 100644 > --- a/drivers/usb/misc/onboard_usb_hub.c > +++ b/drivers/usb/misc/onboard_usb_hub.c > @@ -409,7 +409,6 @@ static void onboard_hub_usbdev_disconnect(struct usb_device *udev) > static const struct usb_device_id onboard_hub_id_table[] = { > { USB_DEVICE(VENDOR_ID_GENESYS, 0x0608) }, /* Genesys Logic GL850G USB 2.0 */ > { USB_DEVICE(VENDOR_ID_GENESYS, 0x0610) }, /* Genesys Logic GL852G USB 2.0 */ > - { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */ > { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */ > { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */ > { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */ > diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h > index aca5f50eb0da..b96a26a9f746 100644 > --- a/drivers/usb/misc/onboard_usb_hub.h > +++ b/drivers/usb/misc/onboard_usb_hub.h > @@ -35,7 +35,6 @@ static const struct onboard_hub_pdata vialab_vl817_data = { > }; > > static const struct of_device_id onboard_hub_match[] = { > - { .compatible = "usb424,2514", .data = µchip_usb424_data, }, > { .compatible = "usb424,2517", .data = µchip_usb424_data, }, > { .compatible = "usb451,8140", .data = &ti_tusb8041_data, }, > { .compatible = "usb451,8142", .data = &ti_tusb8041_data, },
diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c index 83f14ca1d38e..ff15302e0f43 100644 --- a/drivers/usb/misc/onboard_usb_hub.c +++ b/drivers/usb/misc/onboard_usb_hub.c @@ -409,7 +409,6 @@ static void onboard_hub_usbdev_disconnect(struct usb_device *udev) static const struct usb_device_id onboard_hub_id_table[] = { { USB_DEVICE(VENDOR_ID_GENESYS, 0x0608) }, /* Genesys Logic GL850G USB 2.0 */ { USB_DEVICE(VENDOR_ID_GENESYS, 0x0610) }, /* Genesys Logic GL852G USB 2.0 */ - { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2514) }, /* USB2514B USB 2.0 */ { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */ { USB_DEVICE(VENDOR_ID_REALTEK, 0x0411) }, /* RTS5411 USB 3.1 */ { USB_DEVICE(VENDOR_ID_REALTEK, 0x5411) }, /* RTS5411 USB 2.1 */ diff --git a/drivers/usb/misc/onboard_usb_hub.h b/drivers/usb/misc/onboard_usb_hub.h index aca5f50eb0da..b96a26a9f746 100644 --- a/drivers/usb/misc/onboard_usb_hub.h +++ b/drivers/usb/misc/onboard_usb_hub.h @@ -35,7 +35,6 @@ static const struct onboard_hub_pdata vialab_vl817_data = { }; static const struct of_device_id onboard_hub_match[] = { - { .compatible = "usb424,2514", .data = µchip_usb424_data, }, { .compatible = "usb424,2517", .data = µchip_usb424_data, }, { .compatible = "usb451,8140", .data = &ti_tusb8041_data, }, { .compatible = "usb451,8142", .data = &ti_tusb8041_data, },
BugLink: https://bugs.launchpad.net/bugs/2039786 This reverts commit 43993626de00f8faea2cf4d54aaea8f607331fcf. When the driver loads, all attached USB devices are reconnected, which breaks boot from USB. Temporarily revert support for this hub until a proper fix is available, it's not needed on Pi anyways. [juergh: Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit.] Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- v2: - Keep #define VENDOR_ID_MICROCHIP, it's used by a later commit. --- drivers/usb/misc/onboard_usb_hub.c | 1 - drivers/usb/misc/onboard_usb_hub.h | 1 - 2 files changed, 2 deletions(-)