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

Commit 0a67c126 authored by Sergei Antonov's avatar Sergei Antonov Committed by Greg Kroah-Hartman
Browse files

mmc: moxart: read scr register without changing byte order 



commit d44263222134b5635932974c6177a5cba65a07e8 upstream.

Conversion from big-endian to native is done in a common function
mmc_app_send_scr(). Converting in moxart_transfer_pio() is extra.
Double conversion on a LE system returns an incorrect SCR value,
leads to errors:

mmc0: unrecognised SCR structure version 8

Fixes: 1b66e94e ("mmc: moxart: Add MOXA ART SD/MMC driver")
Signed-off-by: default avatarSergei Antonov <saproj@gmail.com>
Cc: Jonas Jensen <jonas.jensen@gmail.com>
Cc: stable@vger.kernel.org
Link: https://lore.kernel.org/r/20230627120549.2400325-1-saproj@gmail.com


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent 4b4223f7

drivers/mmc/host/moxart-mmc.c

+1 −7
Original line number Diff line number Diff line
@@ -339,13 +339,7 @@ static void moxart_transfer_pio(struct moxart_host *host) 
				return;

			}

			for (len = 0; len < remain && len < host->fifo_width;) {

				/* SCR data must be read in big endian. */

				if (data->mrq->cmd->opcode == SD_APP_SEND_SCR)

					*sgp = ioread32be(host->base +

							  REG_DATA_WINDOW);

				else

					*sgp = ioread32(host->base +

							REG_DATA_WINDOW);

				*sgp = ioread32(host->base + REG_DATA_WINDOW);

				sgp++;

				len += 4;

			}