Skip to contentSkip to conversation

Add some USB hotspot IDs

PATCH New Matthew Garrett 3 participants 7 messages Dec 26, 2022 – Jan 12, 2023

Subsystems (6)
lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 Add some USB hotspot IDs

Add a few additional IDs to support a couple of hotspots I had lying around. V2 avoids reserving the PPP modem endpoint for the MDM9207 devices.

#1 lore raw

PATCH v2 1/3 USB: serial: option: Add generic MDM9207 configurations

The Orbic Speed RC400L presents as a generic MDM9207 device that supports multiple configurations. Add support for the two that expose a set of serial ports.

---
 drivers/usb/serial/option.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/usb/serial/option.c +6 -0
index dee79c7d82d5..5025810db8c9 100644
@@ -1119,6 +1119,12 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
 	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
+	/* Qualcomm MDM9207 - 0: DIAG, 1: modem, 2: AT, 3: NMEA, 4: adb, 5: QMI */
+	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0xf601),
+	  .driver_info = RSVD(4) | RSVD(5) },
+	/* Qualcomm MDM9207 - 0,1: RNDIS, 2: DIAG, 3: modem, 4: AT, 5: NMEA, 6: adb */
+	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0xf622),
+	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
 	/* Quectel products using Qualcomm vendor ID */
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),
Signature · 1 line
2.38.1
maintainer
#2 lore raw

Re: [PATCH V2 1/3] USB: serial: option: Add generic MDM9207 configurations

Quoted 3 lines · Matthew Garrett

The Orbic Speed RC400L presents as a generic MDM9207 device that supports multiple configurations. Add support for the two that expose a set of serial ports.

Would you mind including the output of usb-devices for this device here for completeness?

Quoted 10 lines
---
 drivers/usb/serial/option.c | 6 ++++++
 1 file changed, 6 insertions(+)
drivers/usb/serial/option.c +0 -0
index dee79c7d82d5..5025810db8c9 100644

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1122

Quoted 4 lines
drivers/usb/serial/option.c +1 -0
@@ -1119,6 +1119,12 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x0023)}, /* ONYX 3G device */
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0x9000), /* SIMCom SIM5218 */
 	  .driver_info = NCTRL(0) | NCTRL(1) | NCTRL(2) | NCTRL(3) | RSVD(4) },
+	/* Qualcomm MDM9207 - 0: DIAG, 1: modem, 2: AT, 3: NMEA, 4: adb, 5: QMI */

We typically just include the port layout in the commit message (along with usb-devices output). Then you can move the device comment to the end of the USB_DEVICE() line (cf. ONYX 3G device above).

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1130

Quoted 8 lines
drivers/usb/serial/option.c +5 -0
+	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0xf601),
+	  .driver_info = RSVD(4) | RSVD(5) },
+	/* Qualcomm MDM9207 - 0,1: RNDIS, 2: DIAG, 3: modem, 4: AT, 5: NMEA, 6: adb */
+	{ USB_DEVICE(QUALCOMM_VENDOR_ID, 0xf622),
+	  .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
 	/* Quectel products using Qualcomm vendor ID */
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC15)},
 	{ USB_DEVICE(QUALCOMM_VENDOR_ID, QUECTEL_PRODUCT_UC20),

Johan

#3 lore raw

PATCH v2 2/3 net: usb: qmi_wwan: Add generic MDM9207 configuration

In reply to Matthew Garrett

The Orbic Speed RC400L presents as a generic MDM9207 device that supports multiple configurations with different USB IDs. One exposes a QMI interface. Add the ID for that.

---
 drivers/net/usb/qmi_wwan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
index a808d718c012..bf05b7feacc0 100644
@@ -1223,6 +1223,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x05c6, 0x90b2, 3)},    /* ublox R410M */
 	{QMI_FIXED_INTF(0x05c6, 0x920d, 0)},
 	{QMI_FIXED_INTF(0x05c6, 0x920d, 5)},
+	{QMI_FIXED_INTF(0x05c6, 0xf601, 5)},
 	{QMI_QUIRK_SET_DTR(0x05c6, 0x9625, 4)},	/* YUGA CLM920-NC5 */
 	{QMI_FIXED_INTF(0x0846, 0x68a2, 8)},
 	{QMI_FIXED_INTF(0x0846, 0x68d3, 8)},	/* Netgear Aircard 779S */
Signature · 1 line
2.38.1
maintainer Acked-by on v2 2/3
#4 lore raw

Re: [PATCH V2 2/3] net: usb: qmi_wwan: Add generic MDM9207 configuration

Quoted 14 lines · Matthew Garrett

The Orbic Speed RC400L presents as a generic MDM9207 device that supports multiple configurations with different USB IDs. One exposes a QMI interface. Add the ID for that.

---
 drivers/net/usb/qmi_wwan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +0 -0
index a808d718c012..bf05b7feacc0 100644

drivers/net/usb/qmi_wwan.c static const struct usb_device_id products[] = { · line 1229

Quoted 7 lines
drivers/net/usb/qmi_wwan.c +1 -0
@@ -1223,6 +1223,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x05c6, 0x90b2, 3)},    /* ublox R410M */
 	{QMI_FIXED_INTF(0x05c6, 0x920d, 0)},
 	{QMI_FIXED_INTF(0x05c6, 0x920d, 5)},
+	{QMI_FIXED_INTF(0x05c6, 0xf601, 5)},
 	{QMI_QUIRK_SET_DTR(0x05c6, 0x9625, 4)},	/* YUGA CLM920-NC5 */
 	{QMI_FIXED_INTF(0x0846, 0x68a2, 8)},
 	{QMI_FIXED_INTF(0x0846, 0x68d3, 8)},	/* Netgear Aircard 779S */

Looks good to me, but checkpatch warns about

WARNING: From:/Signed-off-by: email address mismatch: 'From: Matthew Garrett <[email protected]>' != 'Signed-off-by: Matthew Garrett <[email protected]>'

which you might want to consider, unless this was intentional for some reason? In any case:

#5 lore raw

PATCH v2 3/3 USB: serial: option: Add Novatel MiFi 8800L diag endpoint

In reply to Matthew Garrett

The Novatel MiFi 8800L can be configured into exposing additional endpoints by sending four bytes of 0s to the HID endpoint it exposes by default. One of the additional exposed endpoints is a Qualcomm DIAG protocol interface. Add the information for that in order to allow it to be used.

---
 drivers/usb/serial/option.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +2 -0
index 5025810db8c9..40a4ccb888f9 100644
@@ -161,6 +161,7 @@ static void option_instat_callback(struct urb *urb);
 #define NOVATELWIRELESS_PRODUCT_U620L		0x9022
 #define NOVATELWIRELESS_PRODUCT_G2		0xA010
 #define NOVATELWIRELESS_PRODUCT_MC551		0xB001
+#define NOVATELWIRELESS_PRODUCT_8800L		0xB023
 
 #define UBLOX_VENDOR_ID				0x1546
 
@@ -1055,6 +1056,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E362, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E371, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U620L, 0xff, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_8800L, 0xff, 0xff, 0xff) },
 
 	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
 	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },
Signature · 1 line
2.38.1
maintainer
#6 lore raw

Re: [PATCH V2 3/3] USB: serial: option: Add Novatel MiFi 8800L diag endpoint

Quoted 4 lines · Matthew Garrett

The Novatel MiFi 8800L can be configured into exposing additional endpoints by sending four bytes of 0s to the HID endpoint it exposes by default. One of the additional exposed endpoints is a Qualcomm DIAG protocol interface. Add the information for that in order to allow it to be used.

Could you include usb-devices output here too?

Quoted 18 lines
---
 drivers/usb/serial/option.c | 2 ++
 1 file changed, 2 insertions(+)
drivers/usb/serial/option.c +1 -0
index 5025810db8c9..40a4ccb888f9 100644
@@ -161,6 +161,7 @@ static void option_instat_callback(struct urb *urb);
 #define NOVATELWIRELESS_PRODUCT_U620L		0x9022
 #define NOVATELWIRELESS_PRODUCT_G2		0xA010
 #define NOVATELWIRELESS_PRODUCT_MC551		0xB001
+#define NOVATELWIRELESS_PRODUCT_8800L		0xB023
 
 #define UBLOX_VENDOR_ID				0x1546
 

drivers/usb/serial/option.c static const struct usb_device_id option_ids[] = { · line 1062

Quoted 7 lines
drivers/usb/serial/option.c +1 -0
@@ -1055,6 +1056,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E362, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_E371, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_U620L, 0xff, 0x00, 0x00) },
+	{ USB_DEVICE_AND_INTERFACE_INFO(NOVATELWIRELESS_VENDOR_ID, NOVATELWIRELESS_PRODUCT_8800L, 0xff, 0xff, 0xff) },
 
 	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01) },
 	{ USB_DEVICE(AMOI_VENDOR_ID, AMOI_PRODUCT_H01A) },

Johan