[PATCH V2] Add some USB hotspot IDs

[PATCH V2] Add some USB hotspot IDs

[Matthew Garrett]

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.

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

[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.

Signed-off-by: Matthew Garrett <mgarrett@aurora.tech>
---
 drivers/usb/serial/option.c | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index dee79c7d82d5..5025810db8c9 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -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),
-- 
2.38.1

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

[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.

Signed-off-by: Matthew Garrett <mgarrett@aurora.tech>
---
 drivers/net/usb/qmi_wwan.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
index a808d718c012..bf05b7feacc0 100644
--- a/drivers/net/usb/qmi_wwan.c
+++ b/drivers/net/usb/qmi_wwan.c
@@ -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 */
-- 
2.38.1

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

[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.

Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
---
 drivers/usb/serial/option.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index 5025810db8c9..40a4ccb888f9 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -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) },
-- 
2.38.1

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

[Bjørn Mork]

Matthew Garrett <mjg59@srcf.ucam.org> writes:

> 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.
>
> Signed-off-by: Matthew Garrett <mgarrett@aurora.tech>
> ---
>  drivers/net/usb/qmi_wwan.c | 1 +
>  1 file changed, 1 insertion(+)
>
> diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c
> index a808d718c012..bf05b7feacc0 100644
> --- a/drivers/net/usb/qmi_wwan.c
> +++ b/drivers/net/usb/qmi_wwan.c
> @@ -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 <mjg59@srcf.ucam.org>' != 'Signed-off-by: Matthew Garrett <mgarrett@aurora.tech>'

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

Acked-by: Bjørn Mork <bjorn@mork.no>

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

[Johan Hovold]

On Mon, Dec 26, 2022 at 03:47:49PM -0800, Matthew Garrett wrote:
> 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?

> Signed-off-by: Matthew Garrett <mgarrett@aurora.tech>
> ---
>  drivers/usb/serial/option.c | 6 ++++++
>  1 file changed, 6 insertions(+)
> 
> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> index dee79c7d82d5..5025810db8c9 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -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).

> +	{ 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

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

[Johan Hovold]

On Mon, Dec 26, 2022 at 03:47:51PM -0800, Matthew Garrett wrote:
> 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?

> Signed-off-by: Matthew Garrett <mjg59@srcf.ucam.org>
> ---
>  drivers/usb/serial/option.c | 2 ++
>  1 file changed, 2 insertions(+)
> 
> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
> index 5025810db8c9..40a4ccb888f9 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -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) },

Johan