[PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[Slark Xiao]

We added PIDs for MV32-WA/WB MBIM mode before, now we need to add
support for RmNet mode.

Test evidence as below:
T:  Bus=03 Lev=01 Prnt=01 Port=02 Cnt=03 Dev#=  3 Spd=480 MxCh= 0
D:  Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=1e2d ProdID=00f3 Rev=05.04
S:  Manufacturer=Cinterion
S:  Product=Cinterion PID 0x00F3 USB Mobile Broadband
S:  SerialNumber=d7b4be8d
C:  #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA
I:  If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan
I:  If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option
I:  If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option
I:  If#=0x3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option

T:  Bus=03 Lev=01 Prnt=01 Port=02 Cnt=03 Dev#= 10 Spd=480 MxCh= 0
D:  Ver= 2.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS=64 #Cfgs=  1
P:  Vendor=1e2d ProdID=00f4 Rev=05.04
S:  Manufacturer=Cinterion
S:  Product=Cinterion PID 0x00F4 USB Mobile Broadband
S:  SerialNumber=d095087d
C:  #Ifs= 4 Cfg#= 1 Atr=a0 MxPwr=500mA
I:  If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=50 Driver=qmi_wwan
I:  If#=0x1 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option
I:  If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=40 Driver=option
I:  If#=0x3 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=30 Driver=option

Signed-off-by: Slark Xiao <slark_xiao@163.com>
---
 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 de59fa919540..63af8b48831a 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -438,6 +438,8 @@ static void option_instat_callback(struct urb *urb);
 #define CINTERION_PRODUCT_MV31_2_RMNET		0x00b9
 #define CINTERION_PRODUCT_MV32_WA		0x00f1
 #define CINTERION_PRODUCT_MV32_WB		0x00f2
+#define CINTERION_PRODUCT_MV32_WA_RMNET		0x00f3
+#define CINTERION_PRODUCT_MV32_WB_RMNET		0x00f4
 
 /* Olivetti products */
 #define OLIVETTI_VENDOR_ID			0x0b3c
@@ -1995,6 +1997,10 @@ static const struct usb_device_id option_ids[] = {
 	  .driver_info = RSVD(3)},
 	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff),
 	  .driver_info = RSVD(3)},
+	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA_RMNET, 0xff),
+	  .driver_info = RSVD(0)},
+	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB_RMNET, 0xff),
+	  .driver_info = RSVD(0)},
 	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
 	  .driver_info = RSVD(4) },
 	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),
-- 
2.25.1

Re: [PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[gregkh]

On Tue, Aug 16, 2022 at 05:40:35PM +0800, Slark Xiao wrote:
> Any response？

To what?

It was the middle of the merge window, we can't do anything with new
patches until after -rc1 is out, and then we have a few thousand to dig
through afterward.

Relax, there is no rush here.

thanks,

greg k-h

Re:Re: [PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[Slark Xiao]

At 2022-08-16 17:50:01, "gregkh" <gregkh@linuxfoundation.org> wrote:
>On Tue, Aug 16, 2022 at 05:40:35PM +0800, Slark Xiao wrote:
>> Any response？
>
>To what?
>
>It was the middle of the merge window, we can't do anything with new
>patches until after -rc1 is out, and then we have a few thousand to dig
>through afterward.
>
>Relax, there is no rush here.
>
>thanks,
>
>greg k-h
Hi Greg,
  Now v6.0-rc2 is out for several days. I still didn't find any progress about this commit.
Normally such commit would be committed into Johan Hovold's personal project firstly:
index: kernel/git/johan/usb-serial.git and waitting for merge window.
  In some sub-system, the merge window would be closed after rc4.
So Johan or Greg , could you help handle this asap?

Thanks!

Re: Re: [PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[Johan Hovold]

On Wed, Aug 24, 2022 at 04:56:45PM +0800, Slark Xiao wrote:

> At 2022-08-16 17:50:01, "gregkh" <gregkh@linuxfoundation.org> wrote:
> >On Tue, Aug 16, 2022 at 05:40:35PM +0800, Slark Xiao wrote:
> >> Any response？
> >
> >To what?
> >
> >It was the middle of the merge window, we can't do anything with new
> >patches until after -rc1 is out, and then we have a few thousand to dig
> >through afterward.
> >
> >Relax, there is no rush here.
> >
> >thanks,
> >
> >greg k-h
> Hi Greg,
>   Now v6.0-rc2 is out for several days. I still didn't find any progress about this commit.
> Normally such commit would be committed into Johan Hovold's personal project firstly:
> index: kernel/git/johan/usb-serial.git and waitting for merge window.
>   In some sub-system, the merge window would be closed after rc4.
> So Johan or Greg , could you help handle this asap?

Again, relax. I haven't had time to process my queue after the merge
window and some holiday. Nothing is lost and I'll get to your patch in
time.

Johan

Re:Re: Re: [PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[Slark Xiao]

At 2022-08-24 17:26:53, "Johan Hovold" <johan@kernel.org> wrote:
>On Wed, Aug 24, 2022 at 04:56:45PM +0800, Slark Xiao wrote:
>
>> At 2022-08-16 17:50:01, "gregkh" <gregkh@linuxfoundation.org> wrote:
>> >On Tue, Aug 16, 2022 at 05:40:35PM +0800, Slark Xiao wrote:
>> >> Any response？
>> >
>> >To what?
>> >
>> >It was the middle of the merge window, we can't do anything with new
>> >patches until after -rc1 is out, and then we have a few thousand to dig
>> >through afterward.
>> >
>> >Relax, there is no rush here.
>> >
>> >thanks,
>> >
>> >greg k-h
>> Hi Greg,
>>   Now v6.0-rc2 is out for several days. I still didn't find any progress about this commit.
>> Normally such commit would be committed into Johan Hovold's personal project firstly:
>> index: kernel/git/johan/usb-serial.git and waitting for merge window.
>>   In some sub-system, the merge window would be closed after rc4.
>> So Johan or Greg , could you help handle this asap?
>
>Again, relax. I haven't had time to process my queue after the merge
>window and some holiday. Nothing is lost and I'll get to your patch in
>time.
>
>Johan

OK, got it, thanks!

Re: [PATCH] USB: serial: option: add support for Cinterion MV32-WA/WB RmNet mode

[Johan Hovold]

On Wed, Aug 10, 2022 at 11:30:50AM +0800, Slark Xiao wrote:
> We added PIDs for MV32-WA/WB MBIM mode before, now we need to add
> support for RmNet mode.

> Signed-off-by: Slark Xiao <slark_xiao@163.com>
> ---
>  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 de59fa919540..63af8b48831a 100644
> --- a/drivers/usb/serial/option.c
> +++ b/drivers/usb/serial/option.c
> @@ -438,6 +438,8 @@ static void option_instat_callback(struct urb *urb);
>  #define CINTERION_PRODUCT_MV31_2_RMNET		0x00b9
>  #define CINTERION_PRODUCT_MV32_WA		0x00f1
>  #define CINTERION_PRODUCT_MV32_WB		0x00f2
> +#define CINTERION_PRODUCT_MV32_WA_RMNET		0x00f3
> +#define CINTERION_PRODUCT_MV32_WB_RMNET		0x00f4
>  
>  /* Olivetti products */
>  #define OLIVETTI_VENDOR_ID			0x0b3c
> @@ -1995,6 +1997,10 @@ static const struct usb_device_id option_ids[] = {
>  	  .driver_info = RSVD(3)},
>  	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB, 0xff),
>  	  .driver_info = RSVD(3)},
> +	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WA_RMNET, 0xff),
> +	  .driver_info = RSVD(0)},

I moved this entry above CINTERION_PRODUCT_MV32_WB to the keep the
entries sorted.

> +	{ USB_DEVICE_INTERFACE_CLASS(CINTERION_VENDOR_ID, CINTERION_PRODUCT_MV32_WB_RMNET, 0xff),
> +	  .driver_info = RSVD(0)},
>  	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD100),
>  	  .driver_info = RSVD(4) },
>  	{ USB_DEVICE(OLIVETTI_VENDOR_ID, OLIVETTI_PRODUCT_OLICARD120),

Now applied, thanks.

Johan