* [PATCH v2 0/2] usb: add full support for ZTE P685M modem @ 2021-02-05 17:39 Lech Perczak 2021-02-05 17:39 ` [PATCH v2 1/2] net: usb: qmi_wwan: support " Lech Perczak 2021-02-05 17:39 ` [PATCH v2 2/2] usb: serial: option: add full support for ZTE P685M Lech Perczak 0 siblings, 2 replies; 15+ messages in thread From: Lech Perczak @ 2021-02-05 17:39 UTC (permalink / raw) To: linux-usb, netdev; +Cc: Lech Perczak 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(-) -- 2.20.1 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-05 17:39 [PATCH v2 0/2] usb: add full support for ZTE P685M modem Lech Perczak @ 2021-02-05 17:39 ` Lech Perczak 2021-02-06 14:19 ` Bjørn Mork 2021-02-05 17:39 ` [PATCH v2 2/2] usb: serial: option: add full support for ZTE P685M Lech Perczak 1 sibling, 1 reply; 15+ messages in thread From: Lech Perczak @ 2021-02-05 17:39 UTC (permalink / raw) To: linux-usb, netdev; +Cc: Lech Perczak, Bjørn Mork 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: Bjørn Mork <bjorn@mork.no> Signed-off-by: Lech Perczak <lech.perczak@gmail.com> --- v2: no changes to this patch, resend as series. 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 cc4819282820..a0bf7737402f 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -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)}, -- 2.20.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-05 17:39 ` [PATCH v2 1/2] net: usb: qmi_wwan: support " Lech Perczak @ 2021-02-06 14:19 ` Bjørn Mork 2021-02-06 14:50 ` Lech Perczak 0 siblings, 1 reply; 15+ messages in thread From: Bjørn Mork @ 2021-02-06 14:19 UTC (permalink / raw) To: Lech Perczak; +Cc: linux-usb, netdev Lech Perczak <lech.perczak@gmail.com> writes: > 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? > 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: Bjørn Mork <bjorn@mork.no> > Signed-off-by: Lech Perczak <lech.perczak@gmail.com> 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 Acked-by: Bjørn Mork <bjorn@mork.no> ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-06 14:19 ` Bjørn Mork @ 2021-02-06 14:50 ` Lech Perczak 2021-02-06 20:13 ` Jakub Kicinski 0 siblings, 1 reply; 15+ messages in thread From: Lech Perczak @ 2021-02-06 14:50 UTC (permalink / raw) To: Bjørn Mork; +Cc: linux-usb, netdev Hi, W dniu 2021-02-06 o 15:19, Bjørn Mork pisze: > Lech Perczak<lech.perczak@gmail.com> writes: > >> 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? Yes indeed. Looked weird to me too, but at least it confirms the model name found in Windows drivers. >> 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: Bjørn Mork<bjorn@mork.no> >> Signed-off-by: Lech Perczak<lech.perczak@gmail.com> > 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. > Feel free to include > > Acked-by: Bjørn Mork<bjorn@mork.no> Thank you. -- With kind regards, Lech ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-06 14:50 ` Lech Perczak @ 2021-02-06 20:13 ` Jakub Kicinski 2021-02-07 0:54 ` [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M Lech Perczak ` (2 more replies) 0 siblings, 3 replies; 15+ messages in thread From: Jakub Kicinski @ 2021-02-06 20:13 UTC (permalink / raw) To: Lech Perczak; +Cc: Bjørn Mork, linux-usb, netdev On Sat, 6 Feb 2021 15:50:41 +0100 Lech Perczak wrote: > >> Cc: Bjørn Mork<bjorn@mork.no> > >> Signed-off-by: Lech Perczak<lech.perczak@gmail.com> > > 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. 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. ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M 2021-02-06 20:13 ` Jakub Kicinski @ 2021-02-07 0:54 ` Lech Perczak 2021-02-08 9:51 ` Johan Hovold 2021-02-08 9:35 ` [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem Johan Hovold 2021-02-23 18:34 ` [PATCH v3] " Lech Perczak 2 siblings, 1 reply; 15+ messages in thread From: Lech Perczak @ 2021-02-07 0:54 UTC (permalink / raw) To: netdev, linux-usb Cc: Jakub Kicinski, Lech Perczak, Johan Hovold, Bjørn Mork 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 <johan@kernel.org> Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Lech Perczak <lech.perczak@gmail.com> --- 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(-) diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 3fe959104311..485d07df8f69 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -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) }, -- 2.20.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M 2021-02-07 0:54 ` [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M Lech Perczak @ 2021-02-08 9:51 ` Johan Hovold 0 siblings, 0 replies; 15+ messages in thread From: Johan Hovold @ 2021-02-08 9:51 UTC (permalink / raw) To: Lech Perczak; +Cc: netdev, linux-usb, Jakub Kicinski, Bjørn Mork On Sun, Feb 07, 2021 at 01:54:43AM +0100, Lech Perczak wrote: > 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 <johan@kernel.org> > Cc: Bjørn Mork <bjorn@mork.no> > Signed-off-by: Lech Perczak <lech.perczak@gmail.com> > --- > 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. Now applied for -next, thanks. Johan ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-06 20:13 ` Jakub Kicinski 2021-02-07 0:54 ` [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M Lech Perczak @ 2021-02-08 9:35 ` Johan Hovold 2021-02-08 17:52 ` Jakub Kicinski 2021-02-23 18:34 ` [PATCH v3] " Lech Perczak 2 siblings, 1 reply; 15+ messages in thread From: Johan Hovold @ 2021-02-08 9:35 UTC (permalink / raw) To: Jakub Kicinski; +Cc: Lech Perczak, Bjørn Mork, linux-usb, netdev On Sat, Feb 06, 2021 at 12:13:22PM -0800, Jakub Kicinski wrote: > On Sat, 6 Feb 2021 15:50:41 +0100 Lech Perczak wrote: > > >> Cc: Bjørn Mork<bjorn@mork.no> > > >> Signed-off-by: Lech Perczak<lech.perczak@gmail.com> > > > 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. > > 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-08 9:35 ` [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem Johan Hovold @ 2021-02-08 17:52 ` Jakub Kicinski 2021-02-09 12:09 ` Johan Hovold 0 siblings, 1 reply; 15+ messages in thread From: Jakub Kicinski @ 2021-02-08 17:52 UTC (permalink / raw) To: Johan Hovold; +Cc: Lech Perczak, Bjørn Mork, linux-usb, netdev On Mon, 8 Feb 2021 10:35:24 +0100 Johan Hovold wrote: > > 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! ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-08 17:52 ` Jakub Kicinski @ 2021-02-09 12:09 ` Johan Hovold 0 siblings, 0 replies; 15+ messages in thread From: Johan Hovold @ 2021-02-09 12:09 UTC (permalink / raw) To: Jakub Kicinski; +Cc: Lech Perczak, Bjørn Mork, linux-usb, netdev On Mon, Feb 08, 2021 at 09:52:52AM -0800, Jakub Kicinski wrote: > On Mon, 8 Feb 2021 10:35:24 +0100 Johan Hovold wrote: > > > 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-06 20:13 ` Jakub Kicinski 2021-02-07 0:54 ` [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M Lech Perczak 2021-02-08 9:35 ` [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem Johan Hovold @ 2021-02-23 18:34 ` Lech Perczak 2021-02-24 18:10 ` patchwork-bot+netdevbpf 2 siblings, 1 reply; 15+ messages in thread From: Lech Perczak @ 2021-02-23 18:34 UTC (permalink / raw) To: netdev, linux-usb; +Cc: Jakub Kicinski, Lech Perczak, Bjørn Mork 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 Acked-by: Bjørn Mork <bjorn@mork.no> Signed-off-by: Lech Perczak <lech.perczak@gmail.com> --- 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(+) diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 6c3d8c2abd38..17a050521b86 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -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)}, -- 2.20.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
* Re: [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-23 18:34 ` [PATCH v3] " Lech Perczak @ 2021-02-24 18:10 ` patchwork-bot+netdevbpf 2021-03-01 21:13 ` Lech Perczak 0 siblings, 1 reply; 15+ messages in thread From: patchwork-bot+netdevbpf @ 2021-02-24 18:10 UTC (permalink / raw) To: Lech Perczak; +Cc: netdev, linux-usb, kuba, bjorn Hello: This patch was applied to netdev/net.git (refs/heads/master): 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem 2021-02-24 18:10 ` patchwork-bot+netdevbpf @ 2021-03-01 21:13 ` Lech Perczak 2021-03-02 23:12 ` Jakub Kicinski 0 siblings, 1 reply; 15+ messages in thread From: Lech Perczak @ 2021-03-01 21:13 UTC (permalink / raw) To: netdev; +Cc: linux-usb, kuba, bjorn On 2021-02-24 at 19:10, patchwork-bot+netdevbpf@kernel.org wrote: > Hello: > > This patch was applied to netdev/net.git (refs/heads/master): > > 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 > 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 ^ permalink raw reply [flat|nested] 15+ messages in thread
* Re: [PATCH v3] net: usb: qmi_wwan: support ZTE P685M modem 2021-03-01 21:13 ` Lech Perczak @ 2021-03-02 23:12 ` Jakub Kicinski 0 siblings, 0 replies; 15+ messages in thread From: Jakub Kicinski @ 2021-03-02 23:12 UTC (permalink / raw) To: Lech Perczak; +Cc: netdev, linux-usb, bjorn On Mon, 1 Mar 2021 22:13:08 +0100 Lech Perczak wrote: > On 2021-02-24 at 19:10, patchwork-bot+netdevbpf@kernel.org wrote: > > Hello: > > > > This patch was applied to netdev/net.git (refs/heads/master): > > > > 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 > > > 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 Please send this request directly to stable@, we're through with this patch on our end. Thanks! ^ permalink raw reply [flat|nested] 15+ messages in thread
* [PATCH v2 2/2] usb: serial: option: add full support for ZTE P685M 2021-02-05 17:39 [PATCH v2 0/2] usb: add full support for ZTE P685M modem Lech Perczak 2021-02-05 17:39 ` [PATCH v2 1/2] net: usb: qmi_wwan: support " Lech Perczak @ 2021-02-05 17:39 ` Lech Perczak 1 sibling, 0 replies; 15+ messages in thread From: Lech Perczak @ 2021-02-05 17:39 UTC (permalink / raw) To: linux-usb, netdev; +Cc: Lech Perczak, Johan Hovold, Bjørn Mork 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 <johan@kernel.org> Cc: Bjørn Mork <bjorn@mork.no> Signed-off-by: Lech Perczak <lech.perczak@gmail.com> --- 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(-) diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index 3fe959104311..485d07df8f69 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -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) }, -- 2.20.1 ^ permalink raw reply related [flat|nested] 15+ messages in thread
end of thread, other threads:[~2021-03-03 6:14 UTC | newest] Thread overview: 15+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2021-02-05 17:39 [PATCH v2 0/2] usb: add full support for ZTE P685M modem Lech Perczak 2021-02-05 17:39 ` [PATCH v2 1/2] net: usb: qmi_wwan: support " Lech Perczak 2021-02-06 14:19 ` Bjørn Mork 2021-02-06 14:50 ` Lech Perczak 2021-02-06 20:13 ` Jakub Kicinski 2021-02-07 0:54 ` [PATCH v3] usb: serial: option: update interface mapping for ZTE P685M Lech Perczak 2021-02-08 9:51 ` Johan Hovold 2021-02-08 9:35 ` [PATCH v2 1/2] net: usb: qmi_wwan: support ZTE P685M modem Johan Hovold 2021-02-08 17:52 ` Jakub Kicinski 2021-02-09 12:09 ` Johan Hovold 2021-02-23 18:34 ` [PATCH v3] " Lech Perczak 2021-02-24 18:10 ` patchwork-bot+netdevbpf 2021-03-01 21:13 ` Lech Perczak 2021-03-02 23:12 ` Jakub Kicinski 2021-02-05 17:39 ` [PATCH v2 2/2] usb: serial: option: add full support for ZTE P685M Lech Perczak
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).