Add support for Quectel EC25.

To issue an AT command (AT+QCFG="usbnet",2) to change to MBIM mode.

Tested by Shawn Chiou on rpi4; "of course" deraadt@

diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4
index 78631fa..de9287b 100644 (file)
--- a/share/man/man4/umb.4
+++ b/share/man/man4/umb.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: umb.4,v 1.12 2021/03/28 12:10:05 sthen Exp $
+.\"    $OpenBSD: umb.4,v 1.13 2021/05/18 14:23:03 kevlo Exp $
 .\"
 .\" Copyright (c) 2016 genua mbH
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: March 28 2021 $
+.Dd $Mdocdate: May 18 2021 $
 .Dt UMB 4
 .Os
 .Sh NAME
@@ -49,6 +49,7 @@ The following devices should work:
 .It Fibocom L831-EAU
 .\" .It Huawei ME906s -- attaches but needs more work
 .It Medion Mobile S4222 (MediaTek OEM)
+.It Quectel EC25
 .It Sierra Wireless EM7345
 .It Sierra Wireless EM7455
 .It Sierra Wireless EM8805

diff --git a/share/man/man4/umsm.4 b/share/man/man4/umsm.4
index afc2fed..2c0a9f8 100644 (file)
--- a/share/man/man4/umsm.4
+++ b/share/man/man4/umsm.4
@@ -1,4 +1,4 @@
-.\"    $OpenBSD: umsm.4,v 1.95 2018/04/11 04:23:10 bket Exp $
+.\"    $OpenBSD: umsm.4,v 1.96 2021/05/18 14:23:03 kevlo Exp $
 .\"
 .\" Copyright (c) 2006 Jonathan Gray <jsg@openbsd.org>
 .\"
@@ -14,7 +14,7 @@
 .\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
 .\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
 .\"
-.Dd $Mdocdate: April 11 2018 $
+.Dd $Mdocdate: May 18 2021 $
 .Dt UMSM 4
 .Os
 .Sh NAME
@@ -100,6 +100,7 @@ driver:
 .It Li "Option iCON 225" Ta "USB"
 .It Li "Option iCON 505" Ta "USB"
 .It Li "Option GlobeTrotter HSUPA 380E" Ta "PCI Express Mini Card"
+.It Li "Quectel EC25" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8755" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8775" Ta "PCI Express Mini Card"
 .It Li "Sierra Wireless MC8790" Ta "PCI Express Mini Card"

diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index a560e5f..9c585cf 100644 (file)
--- a/sys/dev/usb/if_umb.c
+++ b/sys/dev/usb/if_umb.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: if_umb.c,v 1.44 2021/04/22 14:06:59 patrick Exp $ */
+/*     $OpenBSD: if_umb.c,v 1.45 2021/05/18 14:23:03 kevlo Exp $ */
 
 /*
  * Copyright (c) 2016 genua mbH
@@ -238,6 +238,13 @@ const struct umb_quirk umb_quirks[] = {
          UMATCH_VENDOR_PRODUCT
        },
 
+       { { USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EC25 },
+         0,
+         1,
+         UMATCH_VENDOR_PRODUCT
+       },
+
+
        { { USB_VENDOR_HUAWEI, USB_PRODUCT_HUAWEI_ME906S },
          UMBFLG_NDP_AT_END,
          3,

diff --git a/sys/dev/usb/umsm.c b/sys/dev/usb/umsm.c
index a631f83..3c613bd 100644 (file)
--- a/sys/dev/usb/umsm.c
+++ b/sys/dev/usb/umsm.c
@@ -1,4 +1,4 @@
-/*     $OpenBSD: umsm.c,v 1.118 2020/07/31 10:49:33 mglocker Exp $     */
+/*     $OpenBSD: umsm.c,v 1.119 2021/05/18 14:23:03 kevlo Exp $        */
 
 /*
  * Copyright (c) 2008 Yojiro UO <yuo@nui.org>
@@ -173,6 +173,8 @@ static const struct umsm_type umsm_devs[] = {
        {{ USB_VENDOR_QUANTA2, USB_PRODUCT_QUANTA2_UMASS }, DEV_UMASS4},
        {{ USB_VENDOR_QUANTA2, USB_PRODUCT_QUANTA2_Q101 }, 0},
 
+       {{ USB_VENDOR_QUECTEL, USB_PRODUCT_QUECTEL_EC25 }, 0},
+
        {{ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_AC2746 }, 0},
        {{ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_UMASS_INSTALLER }, DEV_UMASS4},
        {{ USB_VENDOR_ZTE, USB_PRODUCT_ZTE_UMASS_INSTALLER2 }, DEV_UMASS6},

diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 85cdd98..be26749 100644 (file)
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.739 2021/04/25 15:58:01 stsp Exp $
+$OpenBSD: usbdevs,v 1.740 2021/05/18 14:23:03 kevlo Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -644,6 +644,7 @@ vendor THINGM               0x27b8  ThingM
 vendor ASUSTEK         0x2821  ASUSTeK Computer
 vendor PIONEERDJ       0x2b73  Pioneer DJ
 vendor PLANEX          0x2c02  Planex Communications
+vendor QUECTEL         0x2c7c  Quectel
 vendor CLUB3D          0x2d1c  Club 3D
 vendor CLEVO           0x30da  CLEVO
 vendor DYNABOOK                0x30f3  Dynabook
@@ -3680,6 +3681,9 @@ product QUANTA RT3070             0x0304  RT3070
 product QUANTA2 UMASS          0x1000  Quanta USB MSM (umass mode)
 product QUANTA2 Q101           0xea02  Quanta Q101 HSDPA USB modem
 
+/* Quectel products */
+product QUECTEL EC25           0x0125  EC25 LTE
+
 /* Quickshot products */
 product QUICKSHOT STRIKEPAD    0x6238  USB StrikePad