[v2] USB: serial: option: Add support for Quectel EP06

[v2] USB: serial: option: Add support for Quectel EP06

[Kristian Evensen]

The Quectel EP06 is a Cat. 6 LTE modem, and the interface mapping is as
follows:

0: Diag
1: NMEA
2: AT
3: Modem

Interface 4 is QMI and interface 5 is ADB, so they are blacklisted.

This patch should also be considered for -stable. The QMI-patch for this
modem is already in the -stable-queue.

v1->v2:
* Updated commit prefix (thanks Johan Hovold)
* Updated commit message slightly.

Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
---
 drivers/usb/serial/option.c | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/drivers/usb/serial/option.c b/drivers/usb/serial/option.c
index b6320e3be429..2d53e14ff93b 100644
--- a/drivers/usb/serial/option.c
+++ b/drivers/usb/serial/option.c
@@ -241,6 +241,7 @@ static void option_instat_callback(struct urb *urb);
 #define QUECTEL_PRODUCT_EC21			0x0121
 #define QUECTEL_PRODUCT_EC25			0x0125
 #define QUECTEL_PRODUCT_BG96			0x0296
+#define QUECTEL_PRODUCT_EP06			0x0306
 
 #define CMOTECH_VENDOR_ID			0x16d8
 #define CMOTECH_PRODUCT_6001			0x6001
@@ -686,6 +687,10 @@ static const struct option_blacklist_info yuga_clm920_nc5_blacklist = {
 	.reserved = BIT(1) | BIT(4),
 };
 
+static const struct option_blacklist_info quectel_ep06_blacklist = {
+	.reserved = BIT(4) | BIT(5),
+};
+
 static const struct usb_device_id option_ids[] = {
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_COLT) },
 	{ USB_DEVICE(OPTION_VENDOR_ID, OPTION_PRODUCT_RICOLA) },
@@ -1200,6 +1205,8 @@ static const struct usb_device_id option_ids[] = {
 	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
 	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_BG96),
 	  .driver_info = (kernel_ulong_t)&net_intf4_blacklist },
+	{ USB_DEVICE(QUECTEL_VENDOR_ID, QUECTEL_PRODUCT_EP06),
+	  .driver_info = (kernel_ulong_t)&quectel_ep06_blacklist },
 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6001) },
 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_CMU_300) },
 	{ USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6003),

[v2] USB: serial: option: Add support for Quectel EP06

[Johan Hovold]

On Thu, Feb 01, 2018 at 10:32:32AM +0100, Kristian Evensen wrote:
> The Quectel EP06 is a Cat. 6 LTE modem, and the interface mapping is as
> follows:
> 
> 0: Diag
> 1: NMEA
> 2: AT
> 3: Modem
> 
> Interface 4 is QMI and interface 5 is ADB, so they are blacklisted.
> 
> This patch should also be considered for -stable. The QMI-patch for this
> modem is already in the -stable-queue.
> 
> v1->v2:
> * Updated commit prefix (thanks Johan Hovold)
> * Updated commit message slightly.

The changelog typically goes below the cut-off line (---).

> Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>

No need to block this pending the discussion on how to deal with
duplicate blacklist entries. So for my own reference, or if Greg wants
to pick this up sooner:

Acked-by: Johan Hovold <johan@kernel.org>

Thanks,
Johan
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

[v2] USB: serial: option: Add support for Quectel EP06

[Greg Kroah-Hartman]

On Sun, Feb 04, 2018 at 12:55:46PM +1100, Johan Hovold wrote:
> On Thu, Feb 01, 2018 at 10:32:32AM +0100, Kristian Evensen wrote:
> > The Quectel EP06 is a Cat. 6 LTE modem, and the interface mapping is as
> > follows:
> > 
> > 0: Diag
> > 1: NMEA
> > 2: AT
> > 3: Modem
> > 
> > Interface 4 is QMI and interface 5 is ADB, so they are blacklisted.
> > 
> > This patch should also be considered for -stable. The QMI-patch for this
> > modem is already in the -stable-queue.
> > 
> > v1->v2:
> > * Updated commit prefix (thanks Johan Hovold)
> > * Updated commit message slightly.
> 
> The changelog typically goes below the cut-off line (---).
> 
> > Signed-off-by: Kristian Evensen <kristian.evensen@gmail.com>
> 
> No need to block this pending the discussion on how to deal with
> duplicate blacklist entries. So for my own reference, or if Greg wants
> to pick this up sooner:
> 
> Acked-by: Johan Hovold <johan@kernel.org>

Thanks, I'll pick this up once 4.16-rc1 come out.

greg k-h
---
To unsubscribe from this list: send the line "unsubscribe linux-usb" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html