From patchwork Wed Jun 22 13:17:33 2011 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Paolo Pisati X-Patchwork-Id: 101462 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 55F89B7021 for ; Wed, 22 Jun 2011 23:17:44 +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 1QZNJJ-0001VW-Vr; Wed, 22 Jun 2011 13:17:38 +0000 Received: from adelie.canonical.com ([91.189.90.139]) by chlorine.canonical.com with esmtp (Exim 4.71) (envelope-from ) id 1QZNJH-0001T5-GE for kernel-team@lists.ubuntu.com; Wed, 22 Jun 2011 13:17:35 +0000 Received: from youngberry.canonical.com ([91.189.89.112]) by adelie.canonical.com with esmtp (Exim 4.71 #1 (Debian)) id 1QZNJH-0000Jj-Bg for ; Wed, 22 Jun 2011 13:17:35 +0000 Received: from dynamic-adsl-94-36-118-174.clienti.tiscali.it ([94.36.118.174] helo=[192.168.0.32]) by youngberry.canonical.com with esmtpsa (TLS1.0:DHE_RSA_AES_256_CBC_SHA1:32) (Exim 4.71) (envelope-from ) id 1QZNJH-0002ip-7l for kernel-team@lists.ubuntu.com; Wed, 22 Jun 2011 13:17:35 +0000 Message-ID: <4E01EB6D.3090303@canonical.com> Date: Wed, 22 Jun 2011 15:17:33 +0200 From: Paolo Pisati User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:5.0) Gecko/20110602 Thunderbird/5.0b1 MIME-Version: 1.0 To: kernel-team@lists.ubuntu.com Subject: [PATCH] [Natty SRU - both master and ti-omap4] Fix usb on omap hw when gcc 4.6 is used 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 SRU Justification: Impact: when compiled with gcc 4.6, we loose usb on every omap* hw. Fix: see attached patch. Testcase: compile an omap[4] kernel with gcc 4.6 and boot it, you will notice there are no usb devices present. beagle xm, natty kernel and gcc 4.6: flag@ubuntu:~$ lsusb Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub versus beagle xm, natty kernel and gcc 4.6 + ehci fix: flag@ubuntu:~$ lsusb Bus 001 Device 001: ID 1d6b:0002 Linux Foundation 2.0 root hub Bus 002 Device 001: ID 1d6b:0001 Linux Foundation 1.1 root hub Bus 001 Device 002: ID 0424:9514 Standard Microsystems Corp. Bus 001 Device 003: ID 0424:ec00 Standard Microsystems Corp. Bus 001 Device 004: ID 03f0:5307 Hewlett-Packard BugLink: http://launchpad.net/bug/791552 upstream commit 139540170d9d9b7ead3caaf540f161756b356d56 Acked-by: Leann Ogasawara From 91abfd68b912ff7728f59723b35d26625cd562f9 Mon Sep 17 00:00:00 2001 From: Rabin Vincent Date: Wed, 27 Apr 2011 21:07:28 +0530 Subject: [PATCH] USB: ehci: remove structure packing from ehci_def As pointed out by Arnd Bergmann, in include/linux/usb/ehci_def.h, struct ehci_caps is defined with __attribute__((packed)) for no good reason, and this triggers undefined behaviour when using ARM's readl() on pointers to elements of this structure: http://lkml.kernel.org/r/201102021700.20683.arnd@arndb.de The same problem exists with the other two structures in ehci_def.h too, so remove the __attribute__((packed)) from all of them. BugLink: http://launchpad.net/bug/791552 upstream commit 139540170d9d9b7ead3caaf540f161756b356d56 Cc: Arnd Bergmann Signed-off-by: Rabin Vincent Signed-off-by: Greg Kroah-Hartman Signed-off-by: Paolo Pisati --- include/linux/usb/ehci_def.h | 6 +++--- 1 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/linux/usb/ehci_def.h b/include/linux/usb/ehci_def.h index 6563802..d86c33d 100644 --- a/include/linux/usb/ehci_def.h +++ b/include/linux/usb/ehci_def.h @@ -52,7 +52,7 @@ struct ehci_caps { #define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/ #define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */ u8 portroute[8]; /* nibbles for routing - offset 0xC */ -} __attribute__ ((packed)); +}; /* Section 2.3 Host Controller Operational Registers */ @@ -150,7 +150,7 @@ struct ehci_regs { #define PORT_CSC (1<<1) /* connect status change */ #define PORT_CONNECT (1<<0) /* device connected */ #define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC) -} __attribute__ ((packed)); +}; #define USBMODE 0x68 /* USB Device mode */ #define USBMODE_SDIS (1<<3) /* Stream disable */ @@ -194,7 +194,7 @@ struct ehci_dbg_port { u32 data47; u32 address; #define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep)) -} __attribute__ ((packed)); +}; #ifdef CONFIG_EARLY_PRINTK_DBGP #include -- 1.7.5.3