| Message ID | 20190716191205.GA27426@lisa.dawes.za.net (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | [v5] USB: serial/qmi_wwan: add D-Link DWM-222 device ID | expand |
On Tue, Jul 16, 2019 at 09:12:05PM +0200, Rogan Dawes wrote: > Add device id for D-Link DWM-222. > > Cc: stable@vger.kernel.org > --- > Also add the qmi_wwan entry, since it was blacklisted already in option > > Apologies for the spam! You need a signed-off-by line :(
On Tue, Jul 16, 2019 at 09:12:05PM +0200, Rogan Dawes wrote: > Add device id for D-Link DWM-222. > > Cc: stable@vger.kernel.org > --- > Also add the qmi_wwan entry, since it was blacklisted already in option > > Apologies for the spam! No worries, you're getting there. :) > drivers/net/usb/qmi_wwan.c | 1 + > drivers/usb/serial/option.c | 2 ++ > 2 files changed, 3 insertions(+) But please split this up in two patches and run get_maintainer.pl on each. The qmi_wwan one will go through the network tree. Also include the interface layout that Lars provided in the USB serial commit message. And don't forget the SoB line as Greg pointed out. Thanks, Johan
On Tue, 2019-07-16 at 21:12 +0200, Rogan Dawes wrote: > Add device id for D-Link DWM-222. > > Cc: stable@vger.kernel.org > --- > Also add the qmi_wwan entry, since it was blacklisted already in option > > Apologies for the spam! > > drivers/net/usb/qmi_wwan.c | 1 + > drivers/usb/serial/option.c | 2 ++ > 2 files changed, 3 insertions(+) > > diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c > index 8b4ad10cf940..69e0a2acfcb0 100644 > --- a/drivers/net/usb/qmi_wwan.c > +++ b/drivers/net/usb/qmi_wwan.c > @@ -1292,6 +1292,7 @@ static const struct usb_device_id products[] = { > {QMI_FIXED_INTF(0x2001, 0x7e16, 3)}, /* D-Link DWM-221 */ > {QMI_FIXED_INTF(0x2001, 0x7e19, 4)}, /* D-Link DWM-221 B1 */ > {QMI_FIXED_INTF(0x2001, 0x7e35, 4)}, /* D-Link DWM-222 */ > + {QMI_FIXED_INTF(0x2001, 0x7e3d, 4)}, /* D-Link DWM-222 A2 */ > {QMI_FIXED_INTF(0x2020, 0x2031, 4)}, /* Olicard 600 */ > {QMI_FIXED_INTF(0x2020, 0x2033, 4)}, /* BroadMobi BM806U */ > {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)}, /* Sierra Wireless MC7700 */ > diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c > index a0aaf0635359..db6f76bbb471 100644 > --- a/drivers/usb/serial/option.c > +++ b/drivers/usb/serial/option.c > @@ -1951,6 +1951,8 @@ static const struct usb_device_id option_ids[] = { > .driver_info = RSVD(4) }, > { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ > .driver_info = RSVD(4) }, > + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e3d, 0xff), /* D-Link DWM-222 A2 */ > + .driver_info = RSVD(0) | RSVD(4) }, I don't think we actually do need to blacklist interface 0, since that's likely a QCDM/DIAG interface and that does need a serial driver like option or qcserial. Johan, any reason why you thought we should blacklist 0? Dan > { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ > { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ > { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */
On Tue, Jul 16, 2019 at 08:43:52PM -0500, Dan Williams wrote: > On Tue, 2019-07-16 at 21:12 +0200, Rogan Dawes wrote: > > Add device id for D-Link DWM-222. > > @@ -1951,6 +1951,8 @@ static const struct usb_device_id option_ids[] = { > > .driver_info = RSVD(4) }, > > { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ > > .driver_info = RSVD(4) }, > > + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e3d, 0xff), /* D-Link DWM-222 A2 */ > > + .driver_info = RSVD(0) | RSVD(4) }, > > I don't think we actually do need to blacklist interface 0, since > that's likely a QCDM/DIAG interface and that does need a serial driver > like option or qcserial. > > Johan, any reason why you thought we should blacklist 0? It was just me being confused about the Qualcomm protocols and how the diag port was accessed from user space. Thanks, Dan. Rogan, let's keep interface 0 and only blacklist interface 4 as you did originally. Sorry about the confusion. Johan
diff --git a/drivers/net/usb/qmi_wwan.c b/drivers/net/usb/qmi_wwan.c index 8b4ad10cf940..69e0a2acfcb0 100644 --- a/drivers/net/usb/qmi_wwan.c +++ b/drivers/net/usb/qmi_wwan.c @@ -1292,6 +1292,7 @@ static const struct usb_device_id products[] = { {QMI_FIXED_INTF(0x2001, 0x7e16, 3)}, /* D-Link DWM-221 */ {QMI_FIXED_INTF(0x2001, 0x7e19, 4)}, /* D-Link DWM-221 B1 */ {QMI_FIXED_INTF(0x2001, 0x7e35, 4)}, /* D-Link DWM-222 */ + {QMI_FIXED_INTF(0x2001, 0x7e3d, 4)}, /* D-Link DWM-222 A2 */ {QMI_FIXED_INTF(0x2020, 0x2031, 4)}, /* Olicard 600 */ {QMI_FIXED_INTF(0x2020, 0x2033, 4)}, /* BroadMobi BM806U */ {QMI_FIXED_INTF(0x0f3d, 0x68a2, 8)}, /* Sierra Wireless MC7700 */ diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c index a0aaf0635359..db6f76bbb471 100644 --- a/drivers/usb/serial/option.c +++ b/drivers/usb/serial/option.c @@ -1951,6 +1951,8 @@ static const struct usb_device_id option_ids[] = { .driver_info = RSVD(4) }, { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e35, 0xff), /* D-Link DWM-222 */ .driver_info = RSVD(4) }, + { USB_DEVICE_INTERFACE_CLASS(0x2001, 0x7e3d, 0xff), /* D-Link DWM-222 A2 */ + .driver_info = RSVD(0) | RSVD(4) }, { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e01, 0xff, 0xff, 0xff) }, /* D-Link DWM-152/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x3e02, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/C1 */ { USB_DEVICE_AND_INTERFACE_INFO(0x07d1, 0x7e11, 0xff, 0xff, 0xff) }, /* D-Link DWM-156/A3 */