At 2022-02-09 22:27:01, "Johan Hovold" <johan@xxxxxxxxxx> wrote:
>On Wed, Feb 09, 2022 at 11:15:35AM +0800, Slark Xiao wrote:
>> Dell DW5829e same as DW5821e except CAT level.
>> DW5821e supports CAT16 but DW5829e supports CAT9.
>> There are 2 types product of DW5829e: normal and eSIM.
>> So we will add 2 PID for DW5829e.
>> And for each PID, it support MBIM or RMNET.
>> Let's see test evidence as below:
>>
>> DW5829e MBIM mode:
>> T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 4 Spd=5000 MxCh= 0
>> D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 2
>> P: Vendor=413c ProdID=81e6 Rev=03.18
>> S: Manufacturer=Dell Inc.
>> S: Product=DW5829e Snapdragon X20 LTE
>> S: SerialNumber=0123456789ABCDEF
>> C: #Ifs= 7 Cfg#= 2 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=00 Prot=00 Driver=option
>> I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
>> I: If#=0x6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
>>
>> DW5829e RMNET mode:
>> T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 5 Spd=5000 MxCh= 0
>> D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1
>> P: Vendor=413c ProdID=81e6 Rev=03.18
>> S: Manufacturer=Dell Inc.
>> S: Product=DW5829e Snapdragon X20 LTE
>> S: SerialNumber=0123456789ABCDEF
>> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA
>> I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
>> I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid
>> I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
>>
>> DW5829e-eSIM MBIM mode:
>> T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 6 Spd=5000 MxCh= 0
>> D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 2
>> P: Vendor=413c ProdID=81e4 Rev=03.18
>> S: Manufacturer=Dell Inc.
>> S: Product=DW5829e-eSIM Snapdragon X20 LTE
>> S: SerialNumber=0123456789ABCDEF
>> C: #Ifs= 7 Cfg#= 2 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=00 Prot=00 Driver=option
>> I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
>> I: If#=0x6 Alt= 0 #EPs= 1 Cls=ff(vend.) Sub=ff Prot=ff Driver=(none)
>>
>> DW5829e-eSIM RMNET mode:
>> T: Bus=04 Lev=01 Prnt=01 Port=01 Cnt=01 Dev#= 7 Spd=5000 MxCh= 0
>> D: Ver= 3.10 Cls=ef(misc ) Sub=02 Prot=01 MxPS= 9 #Cfgs= 1
>> P: Vendor=413c ProdID=81e4 Rev=03.18
>> S: Manufacturer=Dell Inc.
>> S: Product=DW5829e-eSIM Snapdragon X20 LTE
>> S: SerialNumber=0123456789ABCDEF
>> C: #Ifs= 6 Cfg#= 1 Atr=a0 MxPwr=896mA
>> I: If#=0x0 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=ff Prot=ff Driver=qmi_wwan
>> I: If#=0x1 Alt= 0 #EPs= 1 Cls=03(HID ) Sub=00 Prot=00 Driver=usbhid
>> I: If#=0x2 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x3 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x4 Alt= 0 #EPs= 3 Cls=ff(vend.) Sub=00 Prot=00 Driver=option
>> I: If#=0x5 Alt= 0 #EPs= 2 Cls=ff(vend.) Sub=ff Prot=ff Driver=option
>>
>> BTW, the interface 0x6 of MBIM mode is GNSS port, which not same as NMEA
>> port. So it's banned from serial option driver.
>> The remaining interfaces 0x2-0x5 are: MODEM, MODEM, NMEA, DIAG.
>>
>> Signed-off-by: Slark Xiao <slark_xiao@xxxxxxx>
>
>Thanks for providing all the necessary details.
>
>> ---
>> 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 962e9943fc20..b47bad810eec 100644
>> --- a/drivers/usb/serial/option.c
>> +++ b/drivers/usb/serial/option.c
>> @@ -198,6 +198,8 @@ static void option_instat_callback(struct urb *urb);
>>
>> #define DELL_PRODUCT_5821E 0x81d7
>> #define DELL_PRODUCT_5821E_ESIM 0x81e0
>> +#define DELL_PRODUCT_5829E 0x81e6
>> +#define DELL_PRODUCT_5829E_ESIM 0x81e4
>
>Please keep the defines sorted by PID.
>
OK, I will update it in V2 version.
>> #define KYOCERA_VENDOR_ID 0x0c88
>> #define KYOCERA_PRODUCT_KPC650 0x17da
>> @@ -1063,6 +1065,10 @@ static const struct usb_device_id option_ids[] = {
>> .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
>> { USB_DEVICE(DELL_VENDOR_ID, DELL_PRODUCT_5821E_ESIM),
>> .driver_info = RSVD(0) | RSVD(1) | RSVD(6) },
>> + { USB_DEVICE_INTERFACE_CLASS(DELL_VENDOR_ID, DELL_PRODUCT_5829E, 0xff),
>> + .driver_info = RSVD(6) },
>> + { USB_DEVICE_INTERFACE_CLASS(DELL_VENDOR_ID, DELL_PRODUCT_5829E_ESIM, 0xff),
>> + .driver_info = RSVD(6) },
>
>It looks like these entries will cause the driver to bind also to the
>QMI port however.
>
Actually not, currently RMNET port would load the qmi_wwan driver successfully even the class of QMI is also 0xff.
Do you mean I should add RSVD(0) to reduce confusion?
>> { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_E100A) }, /* ADU-E100, ADU-310 */
>> { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_500A) },
>> { USB_DEVICE(ANYDATA_VENDOR_ID, ANYDATA_PRODUCT_ADU_620UW) },
>
>Johan
