From 0d18b60bd15169c98478dfefcaef1f8deb3b53a8 Mon Sep 17 00:00:00 2001
From: kevlo <kevlo@openbsd.org>
Date: Fri, 24 Sep 2021 05:25:37 +0000
Subject: [PATCH] Add support for SIMCom SIM7600. To issue AT commands
 (AT+CUSBPIDSWITCH=9003,1,1 and AT+CLANMODE=1) to change to MBIM mode.

ok deraadt@
---
 share/man/man4/umb.4 | 5 +++--
 sys/dev/usb/if_umb.c | 8 +++++++-
 sys/dev/usb/usbdevs  | 3 ++-
 3 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/share/man/man4/umb.4 b/share/man/man4/umb.4
index de9287bbb57..8c68d4a5ad8 100644
--- a/share/man/man4/umb.4
+++ b/share/man/man4/umb.4
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: umb.4,v 1.13 2021/05/18 14:23:03 kevlo Exp $
+.\"	$OpenBSD: umb.4,v 1.14 2021/09/24 05:25:37 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: May 18 2021 $
+.Dd $Mdocdate: September 24 2021 $
 .Dt UMB 4
 .Os
 .Sh NAME
@@ -50,6 +50,7 @@ The following devices should work:
 .\" .It Huawei ME906s -- attaches but needs more work
 .It Medion Mobile S4222 (MediaTek OEM)
 .It Quectel EC25
+.It SIMCom SIM7600
 .It Sierra Wireless EM7345
 .It Sierra Wireless EM7455
 .It Sierra Wireless EM8805
diff --git a/sys/dev/usb/if_umb.c b/sys/dev/usb/if_umb.c
index 2dac7d3fd1d..4bba4f422ee 100644
--- a/sys/dev/usb/if_umb.c
+++ b/sys/dev/usb/if_umb.c
@@ -1,4 +1,4 @@
-/*	$OpenBSD: if_umb.c,v 1.46 2021/07/04 19:22:31 sthen Exp $ */
+/*	$OpenBSD: if_umb.c,v 1.47 2021/09/24 05:25:37 kevlo Exp $ */
 
 /*
  * Copyright (c) 2016 genua mbH
@@ -256,6 +256,12 @@ const struct umb_quirk umb_quirks[] = {
 	  0,
 	  0
 	},
+
+	{ { USB_VENDOR_SIMCOM, USB_PRODUCT_SIMCOM_SIM7600 },
+	  0,
+	  1,
+	  UMATCH_VENDOR_PRODUCT
+	},
 };
 
 #define umb_lookup(vid, pid)		\
diff --git a/sys/dev/usb/usbdevs b/sys/dev/usb/usbdevs
index 2c4a9dff86b..3dc912f7199 100644
--- a/sys/dev/usb/usbdevs
+++ b/sys/dev/usb/usbdevs
@@ -1,4 +1,4 @@
-$OpenBSD: usbdevs,v 1.741 2021/08/31 22:55:56 jmatthew Exp $
+$OpenBSD: usbdevs,v 1.742 2021/09/24 05:25:37 kevlo Exp $
 /* $NetBSD: usbdevs,v 1.322 2003/05/10 17:47:14 hamajima Exp $ */
 
 /*
@@ -4123,6 +4123,7 @@ product SILICONPORTALS YAPPHONE	0x0201	YAP Phone
 
 /* Simcom products */
 product SIMCOM SIM7600E		0x9001	SIM7600E modem
+product SIMCOM SIM7600		0x9003	SIM7600 LTE
 
 /* Sirius Technologies products */
 product SIRIUS ROADSTER		0x0001	NetComm Roadster II 56
-- 
2.20.1