Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 6cdbf734 authored by Nicolas Pitre's avatar Nicolas Pitre Committed by Linus Torvalds
Browse files

mvsdio: fix handling of partial word at the end of PIO transfer 



Standard data flow for MMC/SD/SDIO cards requires that the mvsdio
controller be set for big endian operation.  This is causing problems
with buffers which length is not a multiple of 4 bytes as the last
partial word doesn't get shifted all the way and stored properly in
memory.  Let's compensate for this.

Signed-off-by: default avatarNicolas Pitre <nico@marvell.com>
CC: stable@kernel.org
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 0ecf24ef

drivers/mmc/host/mvsdio.c

+2 −2
Original line number Diff line number Diff line
@@ -384,7 +384,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev) 
				u16 val[2] = {0, 0};

				val[0] = mvsd_read(MVSD_FIFO);

				val[1] = mvsd_read(MVSD_FIFO);

				memcpy(p, &val, s);

				memcpy(p, ((void *)&val) + 4 - s, s);

				s = 0;

				intr_status = mvsd_read(MVSD_NOR_INTR_STATUS);

			}
@@ -423,7 +423,7 @@ static irqreturn_t mvsd_irq(int irq, void *dev) 
		if (s < 4) {

			if (s && (intr_status & MVSD_NOR_TX_AVAIL)) {

				u16 val[2] = {0, 0};

				memcpy(&val, p, s);

				memcpy(((void *)&val) + 4 - s, p, s);

				mvsd_write(MVSD_FIFO, val[0]);

				mvsd_write(MVSD_FIFO, val[1]);

				s = 0;