Skip to content

Commit

Permalink
[IA64] Fix __{in,out}s{w,l} to handle unaligned data
Browse files Browse the repository at this point in the history
Some ia64 systems produce several repeats of kernel messages like this:

 kernel unaligned access to 0xe000000644220466, ip=0xa000000100516fa1

This was tracked to ide code using the __cmd[] field in "struct request"
via the __outsw() function.  __cmd[] is a char array, so is not guaranteed
to be properly aligned when accessed as words.

Tested-by: Nishanth Aravamudan <nacc@us.ibm.com>
Signed-off-by: James Bottomley <James.Bottomley@HansenPartnership.com>
Signed-off-by: Tony Luck <tony.luck@intel.com>
  • Loading branch information
James Bottomley authored and aegl committed Aug 25, 2008
1 parent 42aca48 commit 8a549f8
Showing 1 changed file with 6 additions and 4 deletions.
10 changes: 6 additions & 4 deletions arch/ia64/include/asm/io.h
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,8 @@
* Copyright (C) 1999 Don Dugger <don.dugger@intel.com>
*/

#include <asm/unaligned.h>

/* We don't use IO slowdowns on the ia64, but.. */
#define __SLOW_DOWN_IO do { } while (0)
#define SLOW_DOWN_IO do { } while (0)
Expand Down Expand Up @@ -241,7 +243,7 @@ __insw (unsigned long port, void *dst, unsigned long count)
unsigned short *dp = dst;

while (count--)
*dp++ = platform_inw(port);
put_unaligned(platform_inw(port), dp++);
}

static inline void
Expand All @@ -250,7 +252,7 @@ __insl (unsigned long port, void *dst, unsigned long count)
unsigned int *dp = dst;

while (count--)
*dp++ = platform_inl(port);
put_unaligned(platform_inl(port), dp++);
}

static inline void
Expand All @@ -268,7 +270,7 @@ __outsw (unsigned long port, const void *src, unsigned long count)
const unsigned short *sp = src;

while (count--)
platform_outw(*sp++, port);
platform_outw(get_unaligned(sp++), port);
}

static inline void
Expand All @@ -277,7 +279,7 @@ __outsl (unsigned long port, const void *src, unsigned long count)
const unsigned int *sp = src;

while (count--)
platform_outl(*sp++, port);
platform_outl(get_unaligned(sp++), port);
}

/*
Expand Down

0 comments on commit 8a549f8

Please sign in to comment.