Skip to contentSkip to conversation

usb: add full support for ZTE P685M modem

PATCH Superseded Lech Perczak 5 participants 16 messages Feb 5, 2021 – Mar 3, 2021

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

v2 cover usb: add full support for ZTE P685M modem

This modem is used in ZTE MF283+ LTE SOHO router, and carriers usually identify it as such. This series is a part of effort to get this router fully supported by OpenWrt. With this series, all interfaces of the modem are fully supported, and it can establish connection through QMI interface.

Lech Perczak (2):
net: usb: qmi_wwan: support ZTE P685M modem
usb: serial: option: add full support for ZTE P685M

 drivers/net/usb/qmi_wwan.c  | 1 +
 drivers/usb/serial/option.c | 2 +-
 2 files changed, 2 insertions(+), 1 deletion(-)
Signature · 1 line
2.20.1
#1 lore raw

PATCH v2 1/2 net: usb: qmi_wwan: support ZTE P685M modem

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms

---
v2: no changes to this patch, resend as series.

 drivers/net/usb/qmi_wwan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
index cc4819282820..a0bf7737402f 100644
@@ -1235,6 +1235,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x19d2, 0x1255, 4)},
 	{QMI_FIXED_INTF(0x19d2, 0x1256, 4)},
 	{QMI_FIXED_INTF(0x19d2, 0x1270, 5)},	/* ZTE MF667 */
+	{QMI_FIXED_INTF(0x19d2, 0x1275, 3)},	/* ZTE P685M */
 	{QMI_FIXED_INTF(0x19d2, 0x1401, 2)},
 	{QMI_FIXED_INTF(0x19d2, 0x1402, 2)},	/* ZTE MF60 */
 	{QMI_FIXED_INTF(0x19d2, 0x1424, 2)},
Signature · 1 line
2.20.1
maintainer Acked-by on v2 1/2
#2 lore raw

Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem

Quoted 11 lines · Lech Perczak

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0

This lookes weird. But I guess that's really the string presented by this device?

Quoted 20 lines

C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option

E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Quoted 2 lines

Patch looks fine to me. But I don't think you can submit a net and usb serial patch in a series. These are two different subsystems.

There's no dependency between the patches so you can just submit them as standalone patches. I.e. no series.

Feel free to include

#3 lore raw

Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem

Hi,

W dniu 2021-02-06 o 15:19, Bjørn Mork pisze:

Quoted 7 lines
Quoted 5 lines · Lech Perczak

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

Quoted 8 lines
Quoted 6 lines
T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0

This lookes weird. But I guess that's really the string presented by this device?

Yes indeed. Looked weird to me too, but at least it confirms the model name found in Windows drivers.

Quoted 20 lines
Quoted 20 lines

C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option

E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Quoted 7 lines
Quoted 2 lines

Patch looks fine to me. But I don't think you can submit a net and usb serial patch in a series. These are two different subsystems.

There's no dependency between the patches so you can just submit them as standalone patches. I.e. no series.

Actually, there is, and I just noticed, that patches are in wrong order. Without patch 2/2 for 'option' driver, there is possibility for that driver to steal interface 3 from qmi_wwan, as currently it will match interface 3 as ff/ff/ff.

With that in mind I'm not really sure how to proceed.

What comes to my mind, is either submit this as series again, with ordering swapped, or submit 2/2 first, wait for it to become merged, and then submit 1/2.

Quoted 3 lines

Feel free to include

Thank you.

--
With kind regards,
Lech

maintainer
#4 lore raw

Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem

Quoted 13 lines · On Sat, 6 Feb 2021 15:50:41 +0100 Lech Perczak wrote:
Quoted 7 lines
Quoted 2 lines

Patch looks fine to me. But I don't think you can submit a net and usb serial patch in a series. These are two different subsystems.

There's no dependency between the patches so you can just submit them as standalone patches. I.e. no series.

Actually, there is, and I just noticed, that patches are in wrong order. Without patch 2/2 for 'option' driver, there is possibility for that driver to steal
interface 3 from qmi_wwan, as currently it will match interface 3 as ff/ff/ff.

Quoted 5 lines

With that in mind I'm not really sure how to proceed.

What comes to my mind, is either submit this as series again, with ordering swapped,
or submit 2/2 first, wait for it to become merged, and then submit 1/2.

Send patch 2, wait for it to hit net, send 1 seems like the safest option. If we're lucky Johan can still send patch 2 for 5.11, otherwise we'll wait until the merge window - we're at rc7 already, it won't take too long.

#5 lore raw

PATCH v3 1/1 usb: serial: option: update interface mapping for ZTE P685M

This patch prepares for qmi_wwan driver support for the device. Previously "option" driver mapped itself to interfaces 0 and 3 (matching ff/ff/ff), while interface 3 is in fact a QMI port. Interfaces 1 and 2 (matching ff/00/00) expose AT commands, and weren't supported previously at all.
Without this patch, a possible conflict would exist if device ID was added to qmi_wwan driver for interface 3.

Update and simplify device ID to match interfaces 0-2 directly, to expose QCDM (0), PCUI (1), and modem (2) ports and avoid conflict with QMI (3), and ADB (4).

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Cc Johan Hovold <[email protected]>
Cc Bjørn Mork <[email protected]>

---
v3: No changes to contents of the patch.
Resend as separate patch to be merged through USB subsystem, the following patch for qmi_wwan will go through netdev tree after this is merged.
Updated commit description, added note about possible qmi_wwan conflict.

v2: Blacklist ports 3-4 and simplify device ID,
as suggested by Lars Melin.

 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +1 -1
index 3fe959104311..485d07df8f69 100644
@@ -1567,7 +1567,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1274, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1275, 0xff, 0xff, 0xff) },
+	{ USB_DEVICE(ZTE_VENDOR_ID, 0x1275), .driver_info = RSVD(3) | RSVD(4) }, /* ZTE P685M */
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1276, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1277, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1278, 0xff, 0xff, 0xff) },
Signature · 1 line
2.20.1
maintainer
#6 lore raw

Re: [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M

Quoted 53 lines · Lech Perczak

This patch prepares for qmi_wwan driver support for the device. Previously "option" driver mapped itself to interfaces 0 and 3 (matching ff/ff/ff), while interface 3 is in fact a QMI port. Interfaces 1 and 2 (matching ff/00/00) expose AT commands, and weren't supported previously at all.
Without this patch, a possible conflict would exist if device ID was added to qmi_wwan driver for interface 3.

Update and simplify device ID to match interfaces 0-2 directly, to expose QCDM (0), PCUI (1), and modem (2) ports and avoid conflict with QMI (3), and ADB (4).

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Cc Johan Hovold <[email protected]>
Cc Bjørn Mork <[email protected]>

---
v3: No changes to contents of the patch.
Resend as separate patch to be merged through USB subsystem, the following patch for qmi_wwan will go through netdev tree after this is merged.
Updated commit description, added note about possible qmi_wwan conflict.

Quoted 2 lines

v2: Blacklist ports 3-4 and simplify device ID,
as suggested by Lars Melin.

Now applied for -next, thanks.

Johan

maintainer
#7 lore raw

Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem

In reply to Jakub Kicinski
Quoted 16 lines · Jakub Kicinski
Quoted 15 lines · On Sat, 6 Feb 2021 15:50:41 +0100 Lech Perczak wrote:
Quoted 7 lines
Quoted 2 lines

Patch looks fine to me. But I don't think you can submit a net and usb serial patch in a series. These are two different subsystems.

There's no dependency between the patches so you can just submit them as standalone patches. I.e. no series.

Actually, there is, and I just noticed, that patches are in wrong order. Without patch 2/2 for 'option' driver, there is possibility for that driver to steal
interface 3 from qmi_wwan, as currently it will match interface 3 as ff/ff/ff.

With that in mind I'm not really sure how to proceed.

Quoted 8 lines
Quoted 3 lines

What comes to my mind, is either submit this as series again, with ordering swapped,
or submit 2/2 first, wait for it to become merged, and then submit 1/2.

Send patch 2, wait for it to hit net, send 1 seems like the safest option. If we're lucky Johan can still send patch 2 for 5.11, otherwise we'll wait until the merge window - we're at rc7 already, it won't take too long.

I usually don't send on new device-ids this late in the release cycle, so I'll queue the USB-serial one up for 5.12-rc1 and you can take this one through net-next.

Johan

maintainer
#8 lore raw

Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem

Quoted 8 lines · On Mon, 8 Feb 2021 10:35:24 +0100 Johan Hovold wrote:
Quoted 4 lines

Send patch 2, wait for it to hit net, send 1 seems like the safest option. If we're lucky Johan can still send patch 2 for 5.11, otherwise we'll wait until the merge window - we're at rc7 already, it won't take too long.

I usually don't send on new device-ids this late in the release cycle, so I'll queue the USB-serial one up for 5.12-rc1 and you can take this one through net-next.

s/net-next/net/ Sound like a plan, thanks!

maintainer
#9 lore raw

Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem

Quoted 11 lines · Jakub Kicinski
Quoted 8 lines · On Mon, 8 Feb 2021 10:35:24 +0100 Johan Hovold wrote:
Quoted 4 lines

Send patch 2, wait for it to hit net, send 1 seems like the safest option. If we're lucky Johan can still send patch 2 for 5.11, otherwise we'll wait until the merge window - we're at rc7 already, it won't take too long.

I usually don't send on new device-ids this late in the release cycle, so I'll queue the USB-serial one up for 5.12-rc1 and you can take this one through net-next.

s/net-next/net/ Sound like a plan, thanks!

I did mean net-next so that both would end up in -rc1 and allowing you to apply it straight away, but either works. :)

While there is a dependency of sort here, it's not the end of the world if the networking one goes in before the USB-serial one; the serial driver might just continue to claim those ports a while longer in some setups (depending on probe order).

Johan

#10 lore raw

PATCH v3 1/1 net: usb: qmi_wwan: support ZTE P685M modem

In reply to Jakub Kicinski

Now that interface 3 in "option" driver is no longer mapped, add device ID matching it to qmi_wwan.

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms

---
Now that patch for "option" has landed in 'master' and 'net', resend the second part.

v3: no changes, resend separately again, add Acked-by from Bjørn Mork.

v2: no changes to this patch, resend as series.

 drivers/net/usb/qmi_wwan.c | 1 +
 1 file changed, 1 insertion(+)
drivers/net/usb/qmi_wwan.c +1 -0
index 6c3d8c2abd38..17a050521b86 100644
@@ -1318,6 +1318,7 @@ static const struct usb_device_id products[] = {
 	{QMI_FIXED_INTF(0x19d2, 0x1255, 4)},
 	{QMI_FIXED_INTF(0x19d2, 0x1256, 4)},
 	{QMI_FIXED_INTF(0x19d2, 0x1270, 5)},	/* ZTE MF667 */
+	{QMI_FIXED_INTF(0x19d2, 0x1275, 3)},	/* ZTE P685M */
 	{QMI_FIXED_INTF(0x19d2, 0x1401, 2)},
 	{QMI_FIXED_INTF(0x19d2, 0x1402, 2)},	/* ZTE MF60 */
 	{QMI_FIXED_INTF(0x19d2, 0x1424, 2)},
Signature · 1 line
2.20.1
#11 lore raw

Re: [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem

This patch was applied to netdev/net.git (refs/heads/master):

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 9 lines · On Tue, 23 Feb 2021 19:34:56 +0100 you wrote:

Now that interface 3 in "option" driver is no longer mapped, add device ID matching it to qmi_wwan.

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

[...]

Here is the summary with links:
- [v3] net: usb: qmi_wwan: support ZTE P685M modem

    https://git.kernel.org/netdev/net/c/88eee9b7b42e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

#12 lore raw

Re: [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem

Quoted 14 lines · On 2021-02-24 at 19:10, [email protected] wrote:

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 9 lines · On Tue, 23 Feb 2021 19:34:56 +0100 you wrote:

Now that interface 3 in "option" driver is no longer mapped, add device ID matching it to qmi_wwan.

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

[...]

Quoted 9 lines

Here is the summary with links:
- [v3] net: usb: qmi_wwan: support ZTE P685M modem

     https://git.kernel.org/netdev/net/c/88eee9b7b42e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

I see that the usb-serial counterpart of this patch was queued up for stable [1], so just for the sake of completeness, it might be worthy to consider this one too. This would likely make OpenWrt folks happy -  I think that going for 5.4.y and upper would suffice, as 5.4 is currently used as stable kernel there, and most of targets are switching to 5.10 right now.

Upstream commit is 88eee9b7b42e69fb622ddb3ff6f37e8e4347f5b2.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.11/usb-serial-option-update-interface-mapping-for-zte-p685m.patch?id=a15ddfc3cd600b31862fdde91f8988e1cfc7bffe

--
With kind regards,
Lech

maintainer
#13 lore raw

Re: [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem

Quoted 31 lines · On Mon, 1 Mar 2021 22:13:08 +0100 Lech Perczak wrote:
Quoted 14 lines · On 2021-02-24 at 19:10, [email protected] wrote:

Hello:

This patch was applied to netdev/net.git (refs/heads/master):

Quoted 9 lines · On Tue, 23 Feb 2021 19:34:56 +0100 you wrote:

Now that interface 3 in "option" driver is no longer mapped, add device ID matching it to qmi_wwan.

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

[...]

Quoted 9 lines

Here is the summary with links:
- [v3] net: usb: qmi_wwan: support ZTE P685M modem

     https://git.kernel.org/netdev/net/c/88eee9b7b42e

You are awesome, thank you!
--
Deet-doot-dot, I am a bot.
https://korg.docs.kernel.org/patchwork/pwbot.html

I see that the usb-serial counterpart of this patch was queued up for stable [1], so just for the sake of completeness, it might be worthy to consider this one too. This would likely make OpenWrt folks happy -  I think that going for 5.4.y and upper would suffice, as 5.4 is currently used as stable kernel there, and most of targets are switching to 5.10 right now.

Quoted 4 lines

Upstream commit is 88eee9b7b42e69fb622ddb3ff6f37e8e4347f5b2.

[1]
https://git.kernel.org/pub/scm/linux/kernel/git/stable/stable-queue.git/tree/queue-5.11/usb-serial-option-update-interface-mapping-for-zte-p685m.patch?id=a15ddfc3cd600b31862fdde91f8988e1cfc7bffe

Please send this request directly to stable@, we're through with this patch on our end. Thanks!

#14 lore raw

net: usb: qmi_wwan: support ZTE P685M modem

In reply to Lech Perczak

From: Lech Perczak<[email protected]>

commit 88eee9b7b42e69fb622ddb3ff6f37e8e4347f5b2 upstream.

As commit 6420a569504e212d618d4a4736e2c59ed80a8478:
("USB: serial: option: update interface mapping for ZTE P685M") [1]
was selected for stable, I think its netdev counterpart could also be considered for completeness, if 6420a569504e is merged.

This patch only adds a new device ID, and would probably make OpenWrt folks happy to drop two backports. I noticed that 6420a569504e was selected for all currently maintained stable branches, but I think that only 5.4.y and newer would suffice, as 5.4.y is currently used as stable kernel where those two patches are required.

[1] https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/drivers/usb/serial/option.c?id=6420a569504e212d618d4a4736e2c59ed80a8478

--
With kind regards,
Lech

#15 lore raw

PATCH v2 2/2 usb: serial: option: add full support for ZTE P685M

In reply to Lech Perczak

Only 1st (DIAG) port was supported, support ports 1 (PCUI) and 2 (Modem) on ff/00/00 too. Ports expose AT command interface. Blacklist ports 3 now used by qmi_wwan and port 4 for ADB, and finally simplify device ID to match only ports 0-2.

The modem is used inside ZTE MF283+ router and carriers identify it as such.
Interface mapping is:
0: QCDM, 1: AT (PCUI), 2: AT (Modem), 3: QMI, 4: ADB

T:  Bus=02 Lev=02 Prnt=02 Port=05 Cnt=01 Dev#=  3 Spd=480  MxCh= 0
D:  Ver= 2.01 Cls=00(>ifc ) Sub=00 Prot=00 MxPS=64 #Cfgs=  1
P:  Vendor=19d2 ProdID=1275 Rev=f0.00
S:  Manufacturer=ZTE,Incorporated
S:  Product=ZTE Technologies MSM
S:  SerialNumber=P685M510ZTED0000CP&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&&0
C:* #Ifs= 5 Cfg#= 1 Atr=a0 MxPwr=500mA
I:* If#= 0 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
E:  Ad=81(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=01(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=83(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=82(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=02(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
E:  Ad=85(I) Atr=03(Int.) MxPS=  10 Ivl=32ms
E:  Ad=84(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=03(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
E:  Ad=87(I) Atr=03(Int.) MxPS=   8 Ivl=32ms
E:  Ad=86(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=04(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
I:* If#= 4 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=42 Prot=01 Driver=(none)
E:  Ad=88(I) Atr=02(Bulk) MxPS= 512 Ivl=0ms
E:  Ad=05(O) Atr=02(Bulk) MxPS= 512 Ivl=0ms
Cc Johan Hovold <[email protected]>
Cc Bjørn Mork <[email protected]>

---
v2: Blacklist ports 3-4 and simplify device ID,
as suggested by Lars Melin.

 drivers/usb/serial/option.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/usb/serial/option.c +1 -1
index 3fe959104311..485d07df8f69 100644
@@ -1567,7 +1567,7 @@ static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1272, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1273, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1274, 0xff, 0xff, 0xff) },
-	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1275, 0xff, 0xff, 0xff) },
+	{ USB_DEVICE(ZTE_VENDOR_ID, 0x1275), .driver_info = RSVD(3) | RSVD(4) }, /* ZTE P685M */
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1276, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1277, 0xff, 0xff, 0xff) },
 	{ USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1278, 0xff, 0xff, 0xff) },
Signature · 1 line
2.20.1