From: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
Date: Thu, 20 Oct 2011 19:25:37 +0000 (+0300)
Subject: usb: align usb_endpoint_descriptor to 16-bit boundary
X-Git-Url: http://git.dujemihanovic.xyz/?a=commitdiff_plain;h=9792987721c7980453fe6447c3fa6593b44f8458;p=u-boot.git

usb: align usb_endpoint_descriptor to 16-bit boundary

The usb_endpoint_descriptor struct is 7 bytes large and is
defined as an array (ep_desc[USB_MAXENDPOINTS])
in the usb_interface struct in include/usb.h

This fact will result in that every odd index in that
array will start at an uneven address, this in
turn makes accesses to u16 wMaxPacketSize unaligned.
Such accesses are illegal on the OpenRISC architecture
(as well as other architectures) and will render a bus error.

Setting the aligned(2) attribute on usb_endpoint_descriptor
will force wMaxPacketSize to a 16-bit boundary.

Signed-off-by: Stefan Kristiansson <stefan.kristiansson@saunalahti.fi>
---

diff --git a/include/usbdescriptors.h b/include/usbdescriptors.h
index 2dec3b93d6..392fcf5378 100644
--- a/include/usbdescriptors.h
+++ b/include/usbdescriptors.h
@@ -199,7 +199,7 @@ struct usb_endpoint_descriptor {
 	u8 bmAttributes;
 	u16 wMaxPacketSize;
 	u8 bInterval;
-} __attribute__ ((packed));
+} __attribute__ ((packed)) __attribute__ ((aligned(2)));
 
 struct usb_interface_descriptor {
 	u8 bLength;