From patchwork Sun Jun 12 23:25:36 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Leann Ogasawara X-Patchwork-Id: 100122 Return-Path: X-Original-To: incoming@patchwork.ozlabs.org Delivered-To: patchwork-incoming@bilbo.ozlabs.org Received: from chlorine.canonical.com (chlorine.canonical.com [91.189.94.204]) by ozlabs.org (Postfix) with ESMTP id 83BB9B7098 for ; Mon, 13 Jun 2011 09:25:58 +1000 (EST) Received: from localhost ([127.0.0.1] helo=chlorine.canonical.com) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QVu2K-0001Sx-VQ; Sun, 12 Jun 2011 23:25:45 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QVu2J-0001Se-2P for kernel-team@lists.ubuntu.com; Sun, 12 Jun 2011 23:25:43 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QVu2I-0004bu-23 for ; Sun, 12 Jun 2011 23:25:42 +0000 Received: from c-24-21-156-70.hsd1.or.comcast.net ([24.21.156.70] helo=[192.168.1.5]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QVu2H-00076p-Lw for kernel-team@lists.ubuntu.com; Sun, 12 Jun 2011 23:25:42 +0000 Subject: [Natty][SRU][PATCH 1/1] usbnet/cdc_ncm: add missing .reset_resume hook From: Leann Ogasawara To: kernel-team Date: Sun, 12 Jun 2011 16:25:36 -0700 Message-ID: <1307921137.2573.18.camel@hp-mini> Mime-Version: 1.0 X-Mailer: Evolution 2.32.2 X-BeenThere: kernel-team@lists.ubuntu.com X-Mailman-Version: 2.1.13 Precedence: list List-Id: Kernel team discussions List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: kernel-team-bounces@lists.ubuntu.com Errors-To: kernel-team-bounces@lists.ubuntu.com BugLink: http://bugs.launchpad.net/bugs/793892 SRU Justification: Impact: The cdc_ncm module, which provides support for the Ericsson F5521gw Mobile Broadband Modem, unregisters the device after suspend because the .reset_resume hook in the driver is not assigned. Fix: Upstream commit 85e3c65fa3a1d0542c18151 Test Case: Without the fix, after resume from suspend you'll notice messages similar to the following in dmesg output: cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm? cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm? cdc_ncm 2-1.4:1.6: usb0: unregister 'cdc_ncm' usb-0000:00:1d.0-1.4, CDC NCM The patch author, who is also the LP bug reporter, submitted this to upstream 2.6.38.y but was unfortunately told there will be no further 2.6.38.y releases: http://marc.info/?l=linux-usb&m=130737305305181&w=2 I've built a test kernel with the patch applied and have confirmation it resolves the issue. Please consider for Natty SRU. Note the only reason it is not a clean cherry-pick is due to the DRIVER_VERSION string. Thanks, Leann The following changes since commit f3fd91d6053b0fc7d37815d2830495ffe5c6b06e: Tim Gardner (1): UBUNTU: Start new release are available in the git repository at: git://kernel.ubuntu.com/ogasawara/ubuntu-natty.git lp793892 Stefan Metzmacher (1): usbnet/cdc_ncm: add missing .reset_resume hook drivers/net/usb/cdc_ncm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) From 9a5ebc5a7ace79a8683f6ac0d10d154d21e73b4d Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Wed, 1 Jun 2011 02:01:41 +0000 Subject: [PATCH] usbnet/cdc_ncm: add missing .reset_resume hook BugLink: http://bugs.launchpad.net/bugs/793892 This avoids messages like this after suspend: cdc_ncm 2-1.4:1.6: no reset_resume for driver cdc_ncm? cdc_ncm 2-1.4:1.7: no reset_resume for driver cdc_ncm? cdc_ncm 2-1.4:1.6: usb0: unregister 'cdc_ncm' usb-0000:00:1d.0-1.4, CDC NCM This is important for the Ericsson F5521gw GSM/UMTS modem. Otherwise modemmanager looses the fact that the cdc_ncm and cdc_acm devices belong together. The cdc_ether module does the same. Signed-off-by: Stefan Metzmacher Signed-off-by: David S. Miller (backport from commit 85e3c65fa3a1d0542c18151 upstream) Signed-off-by: Leann Ogasawara Acked-by: Brad Figg Acked-by: Andy Whitcroft --- drivers/net/usb/cdc_ncm.c | 3 ++- 1 files changed, 2 insertions(+), 1 deletions(-) diff --git a/drivers/net/usb/cdc_ncm.c b/drivers/net/usb/cdc_ncm.c index 7113168..9d78fe6 100644 --- a/drivers/net/usb/cdc_ncm.c +++ b/drivers/net/usb/cdc_ncm.c @@ -54,7 +54,7 @@ #include #include -#define DRIVER_VERSION "7-Feb-2011" +#define DRIVER_VERSION "01-June-2011" /* CDC NCM subclass 3.2.1 */ #define USB_CDC_NCM_NDP16_LENGTH_MIN 0x10 @@ -1254,6 +1254,7 @@ static struct usb_driver cdc_ncm_driver = { .disconnect = cdc_ncm_disconnect, .suspend = usbnet_suspend, .resume = usbnet_resume, + .reset_resume = usbnet_resume, .supports_autosuspend = 1, };