Patchwork [Karmic] SRU: Support for additional Ericsson MBM PID's

login
register
mail settings
Submitter Michael Frey
Date Dec. 21, 2009, 6:47 p.m.
Message ID <4B2FC2B5.5020000@canonical.com>
Download mbox | patch
Permalink /patch/41561/
State Accepted
Delegated to: Stefan Bader
Headers show

Comments

Michael Frey - Dec. 21, 2009, 6:47 p.m.
SRU Justification:

Impact: cdc_ether.c does not support all Ericsson MBM modem ID's.  Would 
be supported modems are grayed out and not accessible.
Specifically the referenced bug: 
https://bugs.edge.launchpad.net/billerica-samos/+bug/476071

Fix: The attached patch is a back-port of the upstream git commit:
http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3a19d56c71bd3a08412d609d219ac8eec0819166

Testcase: After attached patch referenced 3G modem works properly.


Michael Frey
Tim Gardner - Dec. 21, 2009, 7:34 p.m.
Michael Frey wrote:
> SRU Justification:
> 
> Impact: cdc_ether.c does not support all Ericsson MBM modem ID's.  Would
> be supported modems are grayed out and not accessible.
> Specifically the referenced bug:
> https://bugs.edge.launchpad.net/billerica-samos/+bug/476071
> 
> Fix: The attached patch is a back-port of the upstream git commit:
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3a19d56c71bd3a08412d609d219ac8eec0819166
> 
> 
> Testcase: After attached patch referenced 3G modem works properly.
> 
> 
> Michael Frey
> 
> 
> 

ACK
Stefan Bader - Jan. 18, 2010, 1:45 p.m.
I have picked and applied the upstream patch. Upstream stable is about to close
with 2.6.31.12. So this cannot come in via upstream. Lucid includes this patch.

-Stefan

Michael Frey wrote:
> SRU Justification:
> 
> Impact: cdc_ether.c does not support all Ericsson MBM modem ID's.  Would
> be supported modems are grayed out and not accessible.
> Specifically the referenced bug:
> https://bugs.edge.launchpad.net/billerica-samos/+bug/476071
> 
> Fix: The attached patch is a back-port of the upstream git commit:
> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3a19d56c71bd3a08412d609d219ac8eec0819166
> 
> 
> Testcase: After attached patch referenced 3G modem works properly.
> 
> 
> Michael Frey
> 
> 
> 
Acked-by: Stefan Bader <stefan.bader@canonical.com>
Michael Frey - Jan. 19, 2010, 7:34 p.m.
On 01/18/2010 08:45 AM, Stefan Bader wrote:
> I have picked and applied the upstream patch. Upstream stable is about to close
> with 2.6.31.12. So this cannot come in via upstream. Lucid includes this patch.
>
> -Stefan
>
> Michael Frey wrote:
>    
>> SRU Justification:
>>
>> Impact: cdc_ether.c does not support all Ericsson MBM modem ID's.  Would
>> be supported modems are grayed out and not accessible.
>> Specifically the referenced bug:
>> https://bugs.edge.launchpad.net/billerica-samos/+bug/476071
>>
>> Fix: The attached patch is a back-port of the upstream git commit:
>> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3a19d56c71bd3a08412d609d219ac8eec0819166
>>
>>
>> Testcase: After attached patch referenced 3G modem works properly.
>>
>>
>> Michael Frey
>>
>>
>>
>>      
> Acked-by: Stefan Bader<stefan.bader@canonical.com>
>
>    
Which Karmic kernel is this in exactly? 2.6.31-18.55 that is in proposed?

Thanks,
Michael
Tony Espy - Jan. 19, 2010, 9:43 p.m.
Michael Frey wrote:
> On 01/18/2010 08:45 AM, Stefan Bader wrote:
>> I have picked and applied the upstream patch. Upstream stable is about to close
>> with 2.6.31.12. So this cannot come in via upstream. Lucid includes this patch.
>>
>> -Stefan
>>
>> Michael Frey wrote:
>>    
>>> SRU Justification:
>>>
>>> Impact: cdc_ether.c does not support all Ericsson MBM modem ID's.  Would
>>> be supported modems are grayed out and not accessible.
>>> Specifically the referenced bug:
>>> https://bugs.edge.launchpad.net/billerica-samos/+bug/476071
>>>
>>> Fix: The attached patch is a back-port of the upstream git commit:
>>> http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3a19d56c71bd3a08412d609d219ac8eec0819166
>>>
>>>
>>> Testcase: After attached patch referenced 3G modem works properly.
>>>
>>>
>>> Michael Frey
>>>
>>>
>>>
>>>      
>> Acked-by: Stefan Bader<stefan.bader@canonical.com>
>>
>>    
> Which Karmic kernel is this in exactly? 2.6.31-18.55 that is in proposed?

Michael --

[APPLIED] means that the commit has landed in the ubuntu-karmic.git 
tree.  2.6.31-18.55 was tagged and pushed to proposed 12 days ago:

> http://kernel.ubuntu.com/git?p=ubuntu/ubuntu-karmic.git;a=summary

In theory, this commit will land in the next kernel to be pushed to 
-proposed.

Ciao,
/tony

Patch

From 143ddf66a5322639a8db44d2b076ac49c108652e Mon Sep 17 00:00:00 2001
From: Michael Frey <michael@michael-laptop.(none)>
Date: Mon, 21 Dec 2009 13:36:20 -0500
Subject: [PATCH] Support for Ericsson 5540 / 5620 cards in cdc_ether.c
 Fix for LP#476071.
 Back port of:
 http://git.kernel.org/?p=linux/kernel/git/torvalds/linux-2.6.git;a=commitdiff;h=3a19d56c71bd3a08412d609d219ac8eec0819166
 cdc_ether: additional Ericsson MBM PID's to the whitelist


Signed-off-by: Michael Frey <michael.frey@canonical.com>
---
 drivers/net/usb/Kconfig     |    2 +-
 drivers/net/usb/cdc_ether.c |   42 +++++++++++++++++++++++++++++++++++++++++-
 2 files changed, 42 insertions(+), 2 deletions(-)

diff --git a/drivers/net/usb/Kconfig b/drivers/net/usb/Kconfig
index c47237c..f6aca24 100644
--- a/drivers/net/usb/Kconfig
+++ b/drivers/net/usb/Kconfig
@@ -174,7 +174,7 @@  config USB_NET_CDCETHER
 	    * Ericsson Mobile Broadband Module (all variants)
  	    * Motorola (DM100 and SB4100)
  	    * Broadcom Cable Modem (reference design)
-	    * Toshiba (PCX1100U and F3507g)
+            * Toshiba (PCX1100U and F3507g/F3607gw)
 	    * ...
 
 	  This driver creates an interface named "ethX", where X depends on
diff --git a/drivers/net/usb/cdc_ether.c b/drivers/net/usb/cdc_ether.c
index 4a6aff5..721dad5 100644
--- a/drivers/net/usb/cdc_ether.c
+++ b/drivers/net/usb/cdc_ether.c
@@ -544,20 +544,60 @@  static const struct usb_device_id	products [] = {
 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 	.driver_info = (unsigned long) &cdc_info,
 }, {
-	/* Ericsson F3307 */
+       /* Ericsson F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1905, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
+       /* Ericsson F3607gw ver 3 */
 	USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1906, USB_CLASS_COMM,
 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 	.driver_info = (unsigned long) &cdc_info,
 }, {
+       /* Ericsson F3307 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x190a, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
+       /* Ericsson F3307 ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1909, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
+       /* Ericsson C3607w */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0bdb, 0x1049, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
 	/* Toshiba F3507g */
 	USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130b, USB_CLASS_COMM,
 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 	.driver_info = (unsigned long) &cdc_info,
 }, {
+       /* Toshiba F3607gw */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x130c, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
+       /* Toshiba F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x0930, 0x1311, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
 	/* Dell F3507g */
 	USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8147, USB_CLASS_COMM,
 			USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
 	.driver_info = (unsigned long) &cdc_info,
+}, {
+       /* Dell F3607gw */
+       USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8183, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
+}, {
+       /* Dell F3607gw ver 2 */
+       USB_DEVICE_AND_INTERFACE_INFO(0x413c, 0x8184, USB_CLASS_COMM,
+                       USB_CDC_SUBCLASS_MDLM, USB_CDC_PROTO_NONE),
+       .driver_info = (unsigned long) &cdc_info,
 },
 	{ },		// END
 };
-- 
1.6.3.3