diff options
| author | Marek Vasut <marex@denx.de> | 2013-12-26 01:01:24 +0100 |
|---|---|---|
| committer | Lukasz Majewski <l.majewski@samsung.com> | 2013-12-31 09:59:16 +0100 |
| commit | 9b56942f7d2f67e620662cfeb4269a9a938d55da (patch) | |
| tree | 8e26a5db517f11ad16d0aa1d602ecf4b604b0561 | |
| parent | fef24f4f38eb685a6da29097930e6e49b378f8fb (diff) | |
| download | u-boot-imx-9b56942f7d2f67e620662cfeb4269a9a938d55da.zip u-boot-imx-9b56942f7d2f67e620662cfeb4269a9a938d55da.tar.gz u-boot-imx-9b56942f7d2f67e620662cfeb4269a9a938d55da.tar.bz2 | |
mtd: onenand: Fix unaligned access
Fix unaligned access in OneNAND core. The problem is that the ffchars[] array
is an array of "unsigned char", but in onenand_write_ops_nolock() can be passed
to the memcpy_16() function. The memcpy_16() function will treat the buffer as
an array of "unsigned short", thus triggering unaligned access if the compiler
decided ffchars[] to be not aligned.
I managed to trigger the problem with regular ELDK 5.4 GCC compiler.
Signed-off-by: Marek Vasut <marex@denx.de>
Cc: Albert Aribaud <albert.u.boot@aribaud.net>
Cc: Scott Wood <scottwood@freescale.com>
Cc: Tom Rini <trini@ti.com>
| -rw-r--r-- | drivers/mtd/onenand/onenand_base.c | 8 |
1 files changed, 7 insertions, 1 deletions
diff --git a/drivers/mtd/onenand/onenand_base.c b/drivers/mtd/onenand/onenand_base.c index 979e4af..e33e8d3 100644 --- a/drivers/mtd/onenand/onenand_base.c +++ b/drivers/mtd/onenand/onenand_base.c @@ -91,7 +91,13 @@ static struct nand_ecclayout onenand_oob_32 = { .oobfree = { {2, 3}, {14, 2}, {18, 3}, {30, 2} } }; -static const unsigned char ffchars[] = { +/* + * Warning! This array is used with the memcpy_16() function, thus + * it must be aligned to 2 bytes. GCC can make this array unaligned + * as the array is made of unsigned char, which memcpy16() doesn't + * like and will cause unaligned access. + */ +static const unsigned char __aligned(2) ffchars[] = { 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, /* 16 */ 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, 0xff, |