From a43337b2ae3a5839ddea222f88c25ce79964702a Mon Sep 17 00:00:00 2001 From: Greg Kroah-Hartman Date: Thu, 22 Mar 2012 11:26:53 -0700 Subject: [PATCH] 3.0-stable patches added patches: usb-option-add-mediatek-mt6276m-modem-app-interfaces.patch usb-option-add-zte-mf820d.patch usb-option-driver-adding-support-for-telit-cc864-single-cc864-dual-and-de910-dual-modems.patch usb-option-make-interface-blacklist-work-again.patch --- queue-3.0/series | 4 ++ ...ediatek-mt6276m-modem-app-interfaces.patch | 42 +++++++++++++++++++ queue-3.0/usb-option-add-zte-mf820d.patch | 35 ++++++++++++++++ ...gle-cc864-dual-and-de910-dual-modems.patch | 41 ++++++++++++++++++ ...-make-interface-blacklist-work-again.patch | 35 ++++++++++++++++ 5 files changed, 157 insertions(+) create mode 100644 queue-3.0/series create mode 100644 queue-3.0/usb-option-add-mediatek-mt6276m-modem-app-interfaces.patch create mode 100644 queue-3.0/usb-option-add-zte-mf820d.patch create mode 100644 queue-3.0/usb-option-driver-adding-support-for-telit-cc864-single-cc864-dual-and-de910-dual-modems.patch create mode 100644 queue-3.0/usb-option-make-interface-blacklist-work-again.patch diff --git a/queue-3.0/series b/queue-3.0/series new file mode 100644 index 00000000000..0dc366e55e7 --- /dev/null +++ b/queue-3.0/series @@ -0,0 +1,4 @@ +usb-option-add-mediatek-mt6276m-modem-app-interfaces.patch +usb-option-driver-adding-support-for-telit-cc864-single-cc864-dual-and-de910-dual-modems.patch +usb-option-make-interface-blacklist-work-again.patch +usb-option-add-zte-mf820d.patch diff --git a/queue-3.0/usb-option-add-mediatek-mt6276m-modem-app-interfaces.patch b/queue-3.0/usb-option-add-mediatek-mt6276m-modem-app-interfaces.patch new file mode 100644 index 00000000000..fd30341049b --- /dev/null +++ b/queue-3.0/usb-option-add-mediatek-mt6276m-modem-app-interfaces.patch @@ -0,0 +1,42 @@ +From 0d8520a1d7f43328bc7085d4244d93c595064157 Mon Sep 17 00:00:00 2001 +From: Meng Zhang +Date: Mon, 27 Feb 2012 08:24:19 +0100 +Subject: USB: option: Add MediaTek MT6276M modem&app interfaces + +From: Meng Zhang + +commit 0d8520a1d7f43328bc7085d4244d93c595064157 upstream. + +Add MEDIATEK products to Option driver + +Signed-off-by: Meng Zhang +Signed-off-by: Matthias Urlichs +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 7 +++++++ + 1 file changed, 7 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -484,6 +484,9 @@ static void option_instat_callback(struc + #define LG_VENDOR_ID 0x1004 + #define LG_PRODUCT_L02C 0x618f + ++/* MediaTek products */ ++#define MEDIATEK_VENDOR_ID 0x0e8d ++ + /* some devices interfaces need special handling due to a number of reasons */ + enum option_blacklist_reason { + OPTION_BLACKLIST_NONE = 0, +@@ -1198,6 +1201,10 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(VIETTEL_VENDOR_ID, VIETTEL_PRODUCT_VT1000, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZD_VENDOR_ID, ZD_PRODUCT_7000, 0xff, 0xff, 0xff) }, + { USB_DEVICE(LG_VENDOR_ID, LG_PRODUCT_L02C) }, /* docomo L-02C modem */ ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x00, 0x00) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a1, 0xff, 0x02, 0x01) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 0x00, 0x00) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(MEDIATEK_VENDOR_ID, 0x00a2, 0xff, 0x02, 0x01) }, /* MediaTek MT6276M modem & app port */ + { } /* Terminating entry */ + }; + MODULE_DEVICE_TABLE(usb, option_ids); diff --git a/queue-3.0/usb-option-add-zte-mf820d.patch b/queue-3.0/usb-option-add-zte-mf820d.patch new file mode 100644 index 00000000000..7004c239c90 --- /dev/null +++ b/queue-3.0/usb-option-add-zte-mf820d.patch @@ -0,0 +1,35 @@ +From 5889d3d4209c1050b4a3c96c41faf6c0976a4acf Mon Sep 17 00:00:00 2001 +From: Bjørn Mork +Date: Fri, 16 Mar 2012 15:41:26 +0100 +Subject: USB: option: add ZTE MF820D +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Bjørn Mork + +commit 5889d3d4209c1050b4a3c96c41faf6c0976a4acf upstream. + +This device presents a total of 5 interfaces with ff/ff/ff +class/subclass/protocol. The last one of these is verified +to be a QMI/wwan combined interface which should be handled +by the qmi_wwan driver, so we blacklist it here. + +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -901,6 +901,8 @@ static const struct usb_device_id option + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0162, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0164, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0165, 0xff, 0xff, 0xff) }, ++ { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0167, 0xff, 0xff, 0xff), ++ .driver_info = (kernel_ulong_t)&net_intf4_blacklist }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1008, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1010, 0xff, 0xff, 0xff) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x1012, 0xff, 0xff, 0xff) }, diff --git a/queue-3.0/usb-option-driver-adding-support-for-telit-cc864-single-cc864-dual-and-de910-dual-modems.patch b/queue-3.0/usb-option-driver-adding-support-for-telit-cc864-single-cc864-dual-and-de910-dual-modems.patch new file mode 100644 index 00000000000..a1f2615812d --- /dev/null +++ b/queue-3.0/usb-option-driver-adding-support-for-telit-cc864-single-cc864-dual-and-de910-dual-modems.patch @@ -0,0 +1,41 @@ +From 7204cf584836c24b4b06e4ad4a8e6bb8ea84908e Mon Sep 17 00:00:00 2001 +From: Daniele Palmas +Date: Wed, 29 Feb 2012 15:32:05 +0100 +Subject: USB: option driver: adding support for Telit CC864-SINGLE, CC864-DUAL and DE910-DUAL modems + +From: Daniele Palmas + +commit 7204cf584836c24b4b06e4ad4a8e6bb8ea84908e upstream. + +Adding PID for Telit CC864-SINGLE, CC864-DUAL and DE910-DUAL +modems + +Signed-off-by: Daniele Palmas +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 6 ++++++ + 1 file changed, 6 insertions(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -307,6 +307,9 @@ static void option_instat_callback(struc + #define TELIT_VENDOR_ID 0x1bc7 + #define TELIT_PRODUCT_UC864E 0x1003 + #define TELIT_PRODUCT_UC864G 0x1004 ++#define TELIT_PRODUCT_CC864_DUAL 0x1005 ++#define TELIT_PRODUCT_CC864_SINGLE 0x1006 ++#define TELIT_PRODUCT_DE910_DUAL 0x1010 + + /* ZTE PRODUCTS */ + #define ZTE_VENDOR_ID 0x19d2 +@@ -771,6 +774,9 @@ static const struct usb_device_id option + { USB_DEVICE(CMOTECH_VENDOR_ID, CMOTECH_PRODUCT_6008) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864E) }, + { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_UC864G) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_DUAL) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_CC864_SINGLE) }, ++ { USB_DEVICE(TELIT_VENDOR_ID, TELIT_PRODUCT_DE910_DUAL) }, + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, ZTE_PRODUCT_MF622, 0xff, 0xff, 0xff) }, /* ZTE WCDMA products */ + { USB_DEVICE_AND_INTERFACE_INFO(ZTE_VENDOR_ID, 0x0002, 0xff, 0xff, 0xff), + .driver_info = (kernel_ulong_t)&net_intf1_blacklist }, diff --git a/queue-3.0/usb-option-make-interface-blacklist-work-again.patch b/queue-3.0/usb-option-make-interface-blacklist-work-again.patch new file mode 100644 index 00000000000..9e509498d31 --- /dev/null +++ b/queue-3.0/usb-option-make-interface-blacklist-work-again.patch @@ -0,0 +1,35 @@ +From 963940cf472d76eca2d36296e461202cc6997352 Mon Sep 17 00:00:00 2001 +From: Bjørn Mork +Date: Fri, 16 Mar 2012 12:56:44 +0100 +Subject: USB: option: make interface blacklist work again +MIME-Version: 1.0 +Content-Type: text/plain; charset=UTF-8 +Content-Transfer-Encoding: 8bit + +From: Bjørn Mork + +commit 963940cf472d76eca2d36296e461202cc6997352 upstream. + +commit 0d905fd "USB: option: convert Huawei K3765, K4505, K4605 +reservered interface to blacklist" accidentally ANDed two +blacklist tests by leaving out a return. This was not noticed +because the two consecutive bracketless if statements made it +syntactically correct. + +Signed-off-by: Bjørn Mork +Signed-off-by: Greg Kroah-Hartman + +--- + drivers/usb/serial/option.c | 1 + + 1 file changed, 1 insertion(+) + +--- a/drivers/usb/serial/option.c ++++ b/drivers/usb/serial/option.c +@@ -1373,6 +1373,7 @@ static int option_probe(struct usb_seria + serial->interface->cur_altsetting->desc.bInterfaceNumber, + OPTION_BLACKLIST_RESERVED_IF, + (const struct option_blacklist_info *) id->driver_info)) ++ return -ENODEV; + + /* Don't bind network interface on Samsung GT-B3730, it is handled by a separate module */ + if (serial->dev->descriptor.idVendor == SAMSUNG_VENDOR_ID && -- 2.47.3