History

mmc: sdio: fix alignment issue in struct sdio_func

Certain 64-bit systems (e.g. Amlogic Meson GX) require buffers to be used for DMA to be 8-byte-aligned. struct sdio_func has an embedded small DMA buffer not meeting this requirement. When testing switching to descriptor chain mode in meson-gx driver SDIO is broken therefore. Fix this by allocating the small DMA buffer separately as kmalloc ensures that the returned memory area is properly aligned for every basic data type.

Heiner Kallweit committed 9 years ago

Commit 5ef1ecf1 parent 4f7d0292 files · +12 −2Browse files

Showing the changes to include (1 of 2 files). Show all

Unified · Split

include/linux/mmc/sdio_func.h+1−1
@@ -53,7 +53,7 @@ struct sdio_func { · 52 unmodified lines
53 unsigned int state; /* function state */53 unsigned int state; /* function state */
54#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */54#define SDIO_STATE_PRESENT (1<<0) /* present in sysfs */
55 55
56 u8 tmpbuf[4]; /* DMA:able scratch buffer */56 u8 *tmpbuf; /* DMA:able scratch buffer */
57 57
58 unsigned num_info; /* number of info strings */58 unsigned num_info; /* number of info strings */
59 const char **info; /* info strings */59 const char **info; /* info strings */