Skip to content

Commit

Permalink
[AVR32] Remove optimization of unaligned word loads
Browse files Browse the repository at this point in the history
If we let unaligned word loads bypass the generic unaligned handling,
gcc may combine it with a swap.b instruction and turn it into a ldwsp
instruction, which does not work with unaligned addresses.

Revert the optimization to prevent the RNDIS driver from crashing.
Hopefully we'll figure something out later (it may be better to do the
optimization in gcc.)

Signed-off-by: Haavard Skinnemoen <hskinnemoen@atmel.com>
  • Loading branch information
Haavard Skinnemoen committed Jul 18, 2007
1 parent a8e93ed commit e122eaf
Showing 1 changed file with 3 additions and 23 deletions.
26 changes: 3 additions & 23 deletions include/asm-avr32/unaligned.h
Original file line number Diff line number Diff line change
Expand Up @@ -6,31 +6,11 @@
* implementation. The AVR32 AP implementation can handle unaligned
* words, but halfwords must be halfword-aligned, and doublewords must
* be word-aligned.
*
* However, swapped word loads must be word-aligned so we can't
* optimize word loads in general.
*/

#include <asm-generic/unaligned.h>

#ifdef CONFIG_CPU_AT32AP7000

/* REVISIT calling memmove() may be smaller for 64-bit values ... */

#undef get_unaligned
#define get_unaligned(ptr) \
___get_unaligned(ptr, sizeof((*ptr)))
#define ___get_unaligned(ptr, size) \
((size == 4) ? *(ptr) : __get_unaligned(ptr, size))

#undef put_unaligned
#define put_unaligned(val, ptr) \
___put_unaligned((__u64)(val), ptr, sizeof((*ptr)))
#define ___put_unaligned(val, ptr, size) \
do { \
if (size == 4) \
*(ptr) = (val); \
else \
__put_unaligned(val, ptr, size); \
} while (0)

#endif

#endif /* __ASM_AVR32_UNALIGNED_H */

0 comments on commit e122eaf

Please sign in to comment.