[PATCH] fix ehci alignment error

[PATCH] fix ehci alignment error

[Harro Haan]

[-- Attachment #1: fix-ehci-alignment-error.patch --]
[-- Type: text/plain, Size: 688 bytes --]

The Kirkwood gave an unaligned memory access error on
line 742 of drivers/usb/host/echi-hcd.c:
"ehci->last_periodic_enable = ktime_get_real();"

Signed-off-by: Harro Haan <hrhaan@gmail.com>
---
 include/linux/usb/hcd.h |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
index 0097136..c0ecc5a 100644
--- a/include/linux/usb/hcd.h
+++ b/include/linux/usb/hcd.h
@@ -178,7 +178,7 @@ struct usb_hcd {
 	 * this structure.
 	 */
 	unsigned long hcd_priv[0]
-			__attribute__ ((aligned(sizeof(unsigned long))));
+			__attribute__ ((aligned(sizeof(s64))));
 };
 
 /* 2.4 does this a bit differently ... */
-- 
1.7.0.4

Re: [PATCH] fix ehci alignment error

[Greg KH]

On Mon, Oct 10, 2011 at 02:38:27PM +0200, Harro Haan wrote:
> The Kirkwood gave an unaligned memory access error on
> line 742 of drivers/usb/host/echi-hcd.c:
> "ehci->last_periodic_enable = ktime_get_real();"

What is "The Kirkwood"?  What size processor is this?

Re: [PATCH] fix ehci alignment error

[Alan Stern]

On Mon, 10 Oct 2011, Harro Haan wrote:

> The Kirkwood gave an unaligned memory access error on
> line 742 of drivers/usb/host/echi-hcd.c:
> "ehci->last_periodic_enable = ktime_get_real();"
> 
> Signed-off-by: Harro Haan <hrhaan@gmail.com>
> ---
>  include/linux/usb/hcd.h |    2 +-
>  1 files changed, 1 insertions(+), 1 deletions(-)
> 
> diff --git a/include/linux/usb/hcd.h b/include/linux/usb/hcd.h
> index 0097136..c0ecc5a 100644
> --- a/include/linux/usb/hcd.h
> +++ b/include/linux/usb/hcd.h
> @@ -178,7 +178,7 @@ struct usb_hcd {
>  	 * this structure.
>  	 */
>  	unsigned long hcd_priv[0]
> -			__attribute__ ((aligned(sizeof(unsigned long))));
> +			__attribute__ ((aligned(sizeof(s64))));
>  };
>  
>  /* 2.4 does this a bit differently ... */

Acked-by: Alan Stern <stern@rowland.harvard.edu>

Re: [PATCH] fix ehci alignment error

[Måns Rullgård]

Greg KH <gregkh@suse.de> writes:

> On Mon, Oct 10, 2011 at 02:38:27PM +0200, Harro Haan wrote:
>> The Kirkwood gave an unaligned memory access error on
>> line 742 of drivers/usb/host/echi-hcd.c:
>> "ehci->last_periodic_enable = ktime_get_real();"
>
> What is "The Kirkwood"?  What size processor is this?

It's an ARM926-like CPU from Marvell.

-- 
Måns Rullgård
mans@mansr.com

Re: [PATCH] fix ehci alignment error

[Greg KH]

On Mon, Oct 10, 2011 at 05:29:13PM +0100, Måns Rullgård wrote:
> Greg KH <gregkh@suse.de> writes:
> 
> > On Mon, Oct 10, 2011 at 02:38:27PM +0200, Harro Haan wrote:
> >> The Kirkwood gave an unaligned memory access error on
> >> line 742 of drivers/usb/host/echi-hcd.c:
> >> "ehci->last_periodic_enable = ktime_get_real();"
> >
> > What is "The Kirkwood"?  What size processor is this?
> 
> It's an ARM926-like CPU from Marvell.

32 or 64bit?

Re: [PATCH] fix ehci alignment error

[Mikael Pettersson]

Greg KH writes:
 > On Mon, Oct 10, 2011 at 05:29:13PM +0100, Måns Rullgård wrote:
 > > Greg KH <gregkh@suse.de> writes:
 > > 
 > > > On Mon, Oct 10, 2011 at 02:38:27PM +0200, Harro Haan wrote:
 > > >> The Kirkwood gave an unaligned memory access error on
 > > >> line 742 of drivers/usb/host/echi-hcd.c:
 > > >> "ehci->last_periodic_enable = ktime_get_real();"
 > > >
 > > > What is "The Kirkwood"?  What size processor is this?
 > > 
 > > It's an ARM926-like CPU from Marvell.
 > 
 > 32 or 64bit?

All ARMs are 32-bit, but some have instructions for loading or
storing 2 x 32 bits at a time, but also require the corresponding
memory address to be 64-bit aligned.

Re: [PATCH] fix ehci alignment error

[Greg KH]

On Mon, Oct 10, 2011 at 07:31:26PM +0200, Mikael Pettersson wrote:
> Greg KH writes:
>  > On Mon, Oct 10, 2011 at 05:29:13PM +0100, Måns Rullgård wrote:
>  > > Greg KH <gregkh@suse.de> writes:
>  > > 
>  > > > On Mon, Oct 10, 2011 at 02:38:27PM +0200, Harro Haan wrote:
>  > > >> The Kirkwood gave an unaligned memory access error on
>  > > >> line 742 of drivers/usb/host/echi-hcd.c:
>  > > >> "ehci->last_periodic_enable = ktime_get_real();"
>  > > >
>  > > > What is "The Kirkwood"?  What size processor is this?
>  > > 
>  > > It's an ARM926-like CPU from Marvell.
>  > 
>  > 32 or 64bit?
> 
> All ARMs are 32-bit, but some have instructions for loading or
> storing 2 x 32 bits at a time, but also require the corresponding
> memory address to be 64-bit aligned.

Ah, ok, that makes more sense here.  I'll go queue it up.

greg k-h

Re: [PATCH] fix ehci alignment error

[Måns Rullgård]

Greg KH <gregkh@suse.de> writes:

> On Mon, Oct 10, 2011 at 07:31:26PM +0200, Mikael Pettersson wrote:
>> Greg KH writes:
>>  > On Mon, Oct 10, 2011 at 05:29:13PM +0100, Måns Rullgård wrote:
>>  > > Greg KH <gregkh@suse.de> writes:
>>  > > 
>>  > > > On Mon, Oct 10, 2011 at 02:38:27PM +0200, Harro Haan wrote:
>>  > > >> The Kirkwood gave an unaligned memory access error on
>>  > > >> line 742 of drivers/usb/host/echi-hcd.c:
>>  > > >> "ehci->last_periodic_enable = ktime_get_real();"
>>  > > >
>>  > > > What is "The Kirkwood"?  What size processor is this?
>>  > > 
>>  > > It's an ARM926-like CPU from Marvell.
>>  > 
>>  > 32 or 64bit?
>> 
>> All ARMs are 32-bit, but some have instructions for loading or
>> storing 2 x 32 bits at a time, but also require the corresponding
>> memory address to be 64-bit aligned.

To be perfectly accurate, all ARMs have the dual load/store instructions,
but only some (ARMv5 and earlier) require a 64-bit aligned address for
these.  The Kirkwood is an ARMv5 so it does need this alignment.

Furthermore, the standard ARM ABI requires 8-byte alignment for 64-bit
data types regardless of CPU version, which is perhaps a bit unusual for
a 32-bit architecture.

-- 
Måns Rullgård
mans@mansr.com