Commit 13954017 authored by Rabin Vincent's avatar Rabin Vincent Committed by Greg Kroah-Hartman

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.

Cc: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: default avatarRabin Vincent <rabin@rab.in>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@suse.de>
parent 14be249c
...@@ -52,7 +52,7 @@ struct ehci_caps { ...@@ -52,7 +52,7 @@ struct ehci_caps {
#define HCC_PGM_FRAMELISTLEN(p) ((p)&(1 << 1)) /* true: periodic_size changes*/ #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 */ #define HCC_64BIT_ADDR(p) ((p)&(1)) /* true: can use 64-bit addr */
u8 portroute[8]; /* nibbles for routing - offset 0xC */ u8 portroute[8]; /* nibbles for routing - offset 0xC */
} __attribute__ ((packed)); };
/* Section 2.3 Host Controller Operational Registers */ /* Section 2.3 Host Controller Operational Registers */
...@@ -150,7 +150,7 @@ struct ehci_regs { ...@@ -150,7 +150,7 @@ struct ehci_regs {
#define PORT_CSC (1<<1) /* connect status change */ #define PORT_CSC (1<<1) /* connect status change */
#define PORT_CONNECT (1<<0) /* device connected */ #define PORT_CONNECT (1<<0) /* device connected */
#define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC) #define PORT_RWC_BITS (PORT_CSC | PORT_PEC | PORT_OCC)
} __attribute__ ((packed)); };
#define USBMODE 0x68 /* USB Device mode */ #define USBMODE 0x68 /* USB Device mode */
#define USBMODE_SDIS (1<<3) /* Stream disable */ #define USBMODE_SDIS (1<<3) /* Stream disable */
...@@ -194,7 +194,7 @@ struct ehci_dbg_port { ...@@ -194,7 +194,7 @@ struct ehci_dbg_port {
u32 data47; u32 data47;
u32 address; u32 address;
#define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep)) #define DBGP_EPADDR(dev, ep) (((dev)<<8)|(ep))
} __attribute__ ((packed)); };
#ifdef CONFIG_EARLY_PRINTK_DBGP #ifdef CONFIG_EARLY_PRINTK_DBGP
#include <linux/init.h> #include <linux/init.h>
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment