Patchwork [Natty,SRU,-,both,master,and,ti-omap4] Fix usb on omap hw when gcc 4.6 is used

login
register
mail settings
Submitter Paolo Pisati
Date June 22, 2011, 1:17 p.m.
Message ID <4E01EB6D.3090303@canonical.com>
Download mbox | patch
Permalink /patch/101462/
State New
Headers show

Comments

Paolo Pisati - June 22, 2011, 1:17 p.m.
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
Leann Ogasawara - June 22, 2011, 1:23 p.m.
On Wed, 2011-06-22 at 15:17 +0200, Paolo Pisati wrote:
> 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 <leann.ogasawara@canonical.com>
Tim Gardner - June 22, 2011, 1:31 p.m.
On 06/22/2011 07:17 AM, Paolo Pisati wrote:
> 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
>
>
Bryan Wu - July 6, 2011, 6:06 a.m.
Andy and Tim,

I was pinged by Adam for this EHCI fixing patch, which is very
important for Oneiric kernel of ti-omap4, because we are still using
Natty kernel for our Oneiric image.

Would you please upload Natty ti-omap4 kernel? This is patch is in our
repo but not upload yet. I think we need this for our A2 image
testing.

Thanks,
-Bryan

On Wed, Jun 22, 2011 at 9:23 PM, Leann Ogasawara
<leann.ogasawara@canonical.com> wrote:
> On Wed, 2011-06-22 at 15:17 +0200, Paolo Pisati wrote:
>> 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 <leann.ogasawara@canonical.com>
>
>
>
> --
> kernel-team mailing list
> kernel-team@lists.ubuntu.com
> https://lists.ubuntu.com/mailman/listinfo/kernel-team
>
Andy Whitcroft - July 6, 2011, 9:30 a.m.
On Wed, Jul 06, 2011 at 02:06:12PM +0800, Bryan Wu wrote:
> Andy and Tim,
> 
> I was pinged by Adam for this EHCI fixing patch, which is very
> important for Oneiric kernel of ti-omap4, because we are still using
> Natty kernel for our Oneiric image.
> 
> Would you please upload Natty ti-omap4 kernel? This is patch is in our
> repo but not upload yet. I think we need this for our A2 image
> testing.

/me is sorting this with Ogra and the release team.

-apw

Patch

From 91abfd68b912ff7728f59723b35d26625cd562f9 Mon Sep 17 00:00:00 2001
From: Rabin Vincent <rabin@rab.in>
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 <arnd@arndb.de>
Signed-off-by: Rabin Vincent <rabin@rab.in>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
Signed-off-by: Paolo Pisati <paolo.pisati@canonical.com>
---
 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 <linux/init.h>
-- 
1.7.5.3