Message ID | 20220414074434.5699-1-slark_xiao@163.com (mailing list archive) |
---|---|
State | Accepted |
Commit | b4a64ed6e7b857317070fcb9d87ff5d4a73be3e8 |
Headers | show |
Series | USB: serial: option: Adding support for Cinterion MV32-WA/MV32-WB | expand |
On Thu, Apr 14, 2022 at 03:44:34PM +0800, Slark Xiao wrote: > Adding support for Cinterion device MV32-WA/MV32-WB. Nit: Please use imperative mood in your commit message (e.g. use "add" instead of "adding"). > MV32-WA PID is 0x00F1, and MV32-WB PID is 0x00F2. > > Test evidence as below: > T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 4 Spd=5000 MxCh= 0 > D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 > P: Vendor=1e2d ProdID=00f1 Rev=05.04 > S: Manufacturer=Cinterion > S: Product=Cinterion PID 0x00F1 USB Mobile Broadband > S: SerialNumber=78ada8c4 > C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA > I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim > I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim > I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option > I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) > I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option > I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option > > T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 3 Spd=5000 MxCh= 0 > D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 > P: Vendor=1e2d ProdID=00f2 Rev=05.04 > S: Manufacturer=Cinterion > S: Product=Cinterion PID 0x00F2 USB Mobile Broadband > S: SerialNumber=cdd06a78 > C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA > I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim > I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim > I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option > I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) > I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option > I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option > > Interface 0&1: MBIM, 2:Modem, 3: GNSS, 4: NMEA, 5: Diag > GNSS port don't use serial driver. > > Signed-off-by: Slark Xiao <slark_xiao@163.com> > --- > drivers/usb/serial/option.c | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c > index e7755d9cfc61..d947357881c3 100644 > --- a/drivers/usb/serial/option.c > +++ b/drivers/usb/serial/option.c > @@ -432,7 +432,8 @@ static void option_instat_callback(struct urb *urb); > #define CINTERION_PRODUCT_CLS8 0x00b0 > #define CINTERION_PRODUCT_MV31_MBIM 0x00b3 > #define CINTERION_PRODUCT_MV31_RMNET 0x00b7 > - Why remove the section separating newline? > +#define CINTERION_PRODUCT_MV32_WA 0x00f1 > +#define CINTERION_PRODUCT_MV32_WB 0x00f2 > /* Olivetti products */ > #define OLIVETTI_VENDOR_ID 0x0b3c > #define OLIVETTI_PRODUCT_OLICARD100 0xc000 > @@ -1969,6 +1970,10 @@ static const struct usb_device_id option_ids[] = { > .driver_info = RSVD(3)}, > { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff), > .driver_info = RSVD(0)}, > + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff), > + .driver_info = RSVD(3)}, > + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff), > + .driver_info = RSVD(3)}, > { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), > .driver_info = RSVD(4) }, > { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120), Looks good otherwise. I've fixed up the issues pointed out above, but please keep it in mind for next time. Johan
Thanks for the suggestion. At 2022-04-20 15:16:06, "Johan Hovold" <johan@kernel.org> wrote: >On Thu, Apr 14, 2022 at 03:44:34PM +0800, Slark Xiao wrote: >> Adding support for Cinterion device MV32-WA/MV32-WB. > >Nit: Please use imperative mood in your commit message (e.g. use "add" >instead of "adding"). Got it. Actually I just want to align it with previous MV31-W commit. I will notice this in next time. Thanks! > >> MV32-WA PID is 0x00F1, and MV32-WB PID is 0x00F2. >> >> Test evidence as below: >> T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 4 Spd=5000 MxCh= 0 >> D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 >> P: Vendor=1e2d ProdID=00f1 Rev=05.04 >> S: Manufacturer=Cinterion >> S: Product=Cinterion PID 0x00F1 USB Mobile Broadband >> S: SerialNumber=78ada8c4 >> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA >> I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim >> I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim >> I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option >> I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) >> I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option >> I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option >> >> T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 3 Spd=5000 MxCh= 0 >> D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 >> P: Vendor=1e2d ProdID=00f2 Rev=05.04 >> S: Manufacturer=Cinterion >> S: Product=Cinterion PID 0x00F2 USB Mobile Broadband >> S: SerialNumber=cdd06a78 >> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA >> I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim >> I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim >> I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option >> I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) >> I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option >> I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option >> >> Interface 0&1: MBIM, 2:Modem, 3: GNSS, 4: NMEA, 5: Diag >> GNSS port don't use serial driver. >> >> Signed-off-by: Slark Xiao <slark_xiao@163.com> >> --- >> drivers/usb/serial/option.c | 7 ++++++- >> 1 file changed, 6 insertions(+), 1 deletion(-) >> >> diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c >> index e7755d9cfc61..d947357881c3 100644 >> --- a/drivers/usb/serial/option.c >> +++ b/drivers/usb/serial/option.c >> @@ -432,7 +432,8 @@ static void option_instat_callback(struct urb *urb); >> #define CINTERION_PRODUCT_CLS8 0x00b0 >> #define CINTERION_PRODUCT_MV31_MBIM 0x00b3 >> #define CINTERION_PRODUCT_MV31_RMNET 0x00b7 >> - > >Why remove the section separating newline? Sorry for this mistake. > >> +#define CINTERION_PRODUCT_MV32_WA 0x00f1 >> +#define CINTERION_PRODUCT_MV32_WB 0x00f2 >> /* Olivetti products */ >> #define OLIVETTI_VENDOR_ID 0x0b3c >> #define OLIVETTI_PRODUCT_OLICARD100 0xc000 >> @@ -1969,6 +1970,10 @@ static const struct usb_device_id option_ids[] = { >> .driver_info = RSVD(3)}, >> { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff), >> .driver_info = RSVD(0)}, >> + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff), >> + .driver_info = RSVD(3)}, >> + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff), >> + .driver_info = RSVD(3)}, >> { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), >> .driver_info = RSVD(4) }, >> { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120), > >Looks good otherwise. I've fixed up the issues pointed out above, but >please keep it in mind for next time. > >Johan
diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index e7755d9cfc61..d947357881c3 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -432,7 +432,8 @@ static void option_instat_callback(struct urb *urb); #define CINTERION_PRODUCT_CLS8 0x00b0 #define CINTERION_PRODUCT_MV31_MBIM 0x00b3 #define CINTERION_PRODUCT_MV31_RMNET 0x00b7 - +#define CINTERION_PRODUCT_MV32_WA 0x00f1 +#define CINTERION_PRODUCT_MV32_WB 0x00f2 /* Olivetti products */ #define OLIVETTI_VENDOR_ID 0x0b3c #define OLIVETTI_PRODUCT_OLICARD100 0xc000 @@ -1969,6 +1970,10 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(3)}, { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV31_RMNET, 0xff), .driver_info = RSVD(0)}, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA, 0xff), + .driver_info = RSVD(3)}, + { USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff), + .driver_info = RSVD(3)}, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100), .driver_info = RSVD(4) }, { USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
Adding support for Cinterion device MV32-WA/MV32-WB. MV32-WA PID is 0x00F1, and MV32-WB PID is 0x00F2. Test evidence as below: T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 4 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 P: Vendor=1e2d ProdID=00f1 Rev=05.04 S: Manufacturer=Cinterion S: Product=Cinterion PID 0x00F1 USB Mobile Broadband S: SerialNumber=78ada8c4 C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 3 Spd=5000 MxCh= 0 D: Ver= 3.20 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1 P: Vendor=1e2d ProdID=00f2 Rev=05.04 S: Manufacturer=Cinterion S: Product=Cinterion PID 0x00F2 USB Mobile Broadband S: SerialNumber=cdd06a78 C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA I: If#=0x0 Alt= 0 #EPs= 1 Cls=02(commc) Sub=0e Prot=00 Driver=cdc_mbim I: If#=0x1 Alt= 1 #EPs= 2 Cls=0a(data ) Sub=00 Prot=02 Driver=cdc_mbim I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option I: If#=0x3 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none) I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=60 Driver=option I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option Interface 0&1: MBIM, 2:Modem, 3: GNSS, 4: NMEA, 5: Diag GNSS port don't use serial driver. Signed-off-by: Slark Xiao <slark_xiao@163.com> --- drivers/usb/serial/option.c | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-)