| Message ID | 20231116155423.506672-1-juerg.haefliger@canonical.com |
|---|---|
| State | New |
| Headers | show |
| Series | [SRU,M:raspi] UBUNTU: SAUCE: Revert "usb: misc: onboard-hub: add support for Microchip USB2514B USB 2.0 hub" | expand |
I'm hitting a compile error when building the m:raspi kernel with this
patch:
In file included from /build/mantic/drivers/usb/misc/onboard_usb_hub.c:23:
/build/mantic/drivers/usb/misc/onboard_usb_hub.c:411:22: error: 'VENDOR_ID_MICROCHIP' undeclared here (not in a function)
411 | { USB_DEVICE(VENDOR_ID_MICROCHIP, 0x2517) }, /* USB2517 USB 2.0 */
| ^~~~~~~~~~~~~~~~~~~
/build/mantic/include/linux/usb.h:993:22: note: in definition of macro 'USB_DEVICE'
993 | .idVendor = (vend), \
| ^~~~
Jacob
On 11/16/23 9:54 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.
>
> Signed-off-by: Juerg Haefliger<juerg.haefliger@canonical.com>
> ---
> drivers/usb/misc/onboard_usb_hub.c | 2 --
> drivers/usb/misc/onboard_usb_hub.h | 1 -
> 2 files changed, 3 deletions(-)
>
> diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c
> index 83f14ca1d38e..4a4056c09962 100644
> --- a/drivers/usb/misc/onboard_usb_hub.c
> +++ b/drivers/usb/misc/onboard_usb_hub.c
> @@ -330,7 +330,6 @@ static struct platform_driver onboard_hub_driver = {
> /************************** USB driver **************************/
>
> #define VENDOR_ID_GENESYS 0x05e3
> -#define VENDOR_ID_MICROCHIP 0x0424
> #define VENDOR_ID_REALTEK 0x0bda
> #define VENDOR_ID_TI 0x0451
> #define VENDOR_ID_VIA 0x2109
> @@ -409,7 +408,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, },
On Thu, Nov 16, 2023 at 04:54:23PM +0100, 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. > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > drivers/usb/misc/onboard_usb_hub.c | 2 -- > drivers/usb/misc/onboard_usb_hub.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c > index 83f14ca1d38e..4a4056c09962 100644 > --- a/drivers/usb/misc/onboard_usb_hub.c > +++ b/drivers/usb/misc/onboard_usb_hub.c > @@ -330,7 +330,6 @@ static struct platform_driver onboard_hub_driver = { > /************************** USB driver **************************/ > > #define VENDOR_ID_GENESYS 0x05e3 > -#define VENDOR_ID_MICROCHIP 0x0424 > #define VENDOR_ID_REALTEK 0x0bda > #define VENDOR_ID_TI 0x0451 > #define VENDOR_ID_VIA 0x2109 > @@ -409,7 +408,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, }, > -- > 2.40.1 > > > -- > kernel-team mailing list > kernel-team@lists.ubuntu.com > https://lists.ubuntu.com/mailman/listinfo/kernel-team The offending commit is also in the lunar tree, so I would assume the issue is present there, too. I haven't verified this yet, though. Acked-by: Manuel Diewald <manuel.diewald@canonical.com>
On 16.11.23 16:54, 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. > > Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> > --- > drivers/usb/misc/onboard_usb_hub.c | 2 -- > drivers/usb/misc/onboard_usb_hub.h | 1 - > 2 files changed, 3 deletions(-) > > diff --git a/drivers/usb/misc/onboard_usb_hub.c b/drivers/usb/misc/onboard_usb_hub.c > index 83f14ca1d38e..4a4056c09962 100644 > --- a/drivers/usb/misc/onboard_usb_hub.c > +++ b/drivers/usb/misc/onboard_usb_hub.c > @@ -330,7 +330,6 @@ static struct platform_driver onboard_hub_driver = { > /************************** USB driver **************************/ > > #define VENDOR_ID_GENESYS 0x05e3 > -#define VENDOR_ID_MICROCHIP 0x0424 This removes the VENDOR_ID_MICROCHIP > #define VENDOR_ID_REALTEK 0x0bda > #define VENDOR_ID_TI 0x0451 > #define VENDOR_ID_VIA 0x2109 > @@ -409,7 +408,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 */ But here only one definition is removed. I guess there is some other patch missing. > { 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..4a4056c09962 100644 --- a/drivers/usb/misc/onboard_usb_hub.c +++ b/drivers/usb/misc/onboard_usb_hub.c @@ -330,7 +330,6 @@ static struct platform_driver onboard_hub_driver = { /************************** USB driver **************************/ #define VENDOR_ID_GENESYS 0x05e3 -#define VENDOR_ID_MICROCHIP 0x0424 #define VENDOR_ID_REALTEK 0x0bda #define VENDOR_ID_TI 0x0451 #define VENDOR_ID_VIA 0x2109 @@ -409,7 +408,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. Signed-off-by: Juerg Haefliger <juerg.haefliger@canonical.com> --- drivers/usb/misc/onboard_usb_hub.c | 2 -- drivers/usb/misc/onboard_usb_hub.h | 1 - 2 files changed, 3 deletions(-)