On 2020/06/22 14:10, Tobias Heider wrote:
> On Mon, Jun 22, 2020 at 02:01:43PM +0200, Tobias Heider wrote:
> > Hi,
> >
> > I noticed that the ramdisk takes ages to boot on my T420.
> > It seems that without umodem in the kernel, umass tries to attach to my
> > Erricson F5521GW WAN modem and fails after a annoyingly long timeout.
> >
> > The diff below should prevent umass from matching this device.
> >
> > ok?
> >
>
> Whoops, small update because uq_match should be UMATCH_NONE.
>
> diff --git a/sys/dev/usb/umass_quirks.c b/sys/dev/usb/umass_quirks.c
> index cf17d07ef96..ba80c4fb6a6 100644
> --- a/sys/dev/usb/umass_quirks.c
> +++ b/sys/dev/usb/umass_quirks.c
> @@ -473,6 +473,14 @@ const struct umass_quirk umass_quirks[] = {
> UMATCH_VENDOR_PRODUCT,
> NULL, NULL
> },
> +
> + { { USB_VENDOR_ERICSSON, USB_PRODUCT_ERICSSON_F5521GW },
> + UMASS_WPROTO_UNSPEC, UMASS_CPROTO_UNSPEC,
> + 0,
> + 0,
> + UMATCH_NONE,
> + NULL, NULL
> + },
> };
>
> const struct umass_quirk *
> diff --git a/sys/dev/usb/usbdevs.h b/sys/dev/usb/usbdevs.h
> index 45fda88512f..e9d2b6e6169 100644
> --- a/sys/dev/usb/usbdevs.h
> +++ b/sys/dev/usb/usbdevs.h
Generally OK but don't commit directly to usbdevs.h.
Edit usbdevs, commit, run "make", then commit the generated files
usbdevs_data.h and usbdevs.h.
> @@ -427,6 +427,7 @@
> #define USB_VENDOR_AMBIT 0x0bb2 /* Ambit Microsystems */
> #define USB_VENDOR_HTC 0x0bb4 /* HTC */
> #define USB_VENDOR_REALTEK 0x0bda /* Realtek */
> +#define USB_VENDOR_ERICSSON 0x0bdb /* Ericsson */
> #define USB_VENDOR_MEI 0x0bed /* MEI */
> #define USB_VENDOR_ADDONICS2 0x0bf6 /* Addonics Technology
> */
> #define USB_VENDOR_FSC 0x0bf8 /* Fujitsu Siemens Computers */
> @@ -1774,6 +1775,9 @@
> #define USB_PRODUCT_EPSON_DX6000 0x082e /* Stylus
> DX6000 */
> #define USB_PRODUCT_EPSON_DX4000 0x082f /* Stylus
> DX4000 */
>
> +/* Ericsson products */
> +#define USB_PRODUCT_ERICSSON_F5521GW 0x1911 /* Wireless WAN */
> +
> /* e-TEK Labs products */
> #define USB_PRODUCT_ETEK_1COM 0x8007 /* Serial */
>
>
