Commit e5306c3a authored Jun 07, 2016 by Ben Dooks Committed by Ulf Hansson Jul 25, 2016

mmc: dw_mmc: fix 32bit little-endian access of des1 field



The IDMAC_SET_BUFFER1_SIZE() macro modifies des1, but does
not check if the value being passed is big or little endian
desptire the des1 field being marked as __le32.

Fix the issue by ensuring the values are changed from the
cpu endian to the descriptor endian by using cpu_to_le32.

Spotted whilst doing big endian conversion work on Exynos,
and stops the mmc worker thread from stalling.

Signed-off-by: Ben Dooks <ben.dooks@codethink.co.uk>
Reviewed-by: Shawn Lin <shawn.lin@rock-chips.com>
Tested-by: Shawn Lin <shawn.lin@rock-chips.com>
Signed-off-by: Jaehoon Chung <jh80.chung@samsung.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>

parent 7a3c5677

drivers/mmc/host/dw_mmc.c

+1 −1

Original line number	Original line	Diff line number	Diff line
	@@ -92,7 +92,7 @@ struct idmac_desc {

	__le32 des1; /* Buffer sizes */		__le32 des1; /* Buffer sizes */
	#define IDMAC_SET_BUFFER1_SIZE(d, s) \		#define IDMAC_SET_BUFFER1_SIZE(d, s) \
	((d)->des1 = ((d)->des1 & 0x03ffe000) \| ((s) & 0x1fff))		((d)->des1 = ((d)->des1 & cpu_to_le32(0x03ffe000)) \| (cpu_to_le32((s) & 0x1fff)))

	__le32 des2; /* buffer 1 physical address */		__le32 des2; /* buffer 1 physical address */

Admin message