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

Commit c286d03c authored by Johan Kristell's avatar Johan Kristell Committed by Linus Torvalds
Browse files

mmc_test: block addressed cards 



This patch fixes a bug in the multiblock write tests where the written
data is read back for verifying one block at a time.  The tests in
mmc_test assumes that all cards are byte addressable.

This will cause the multi block write tests to fail, leading the user of
the mmc_test driver thinking there is something wrong with the sdhci
driver they are testing.

The start address for the block is calculated as: blocknum * 512. For
block addressable cards the blocknum alone should be used.

Signed-off-by: default avatarJohan Kristell <johan.kristell@axis.com>
Cc: <linux-mmc@vger.kernel.org>
Signed-off-by: default avatarAndrew Morton <akpm@linux-foundation.org>
Signed-off-by: default avatarLinus Torvalds <torvalds@linux-foundation.org>
parent 93716b94

drivers/mmc/card/mmc_test.c

+6 −3
Original line number Diff line number Diff line
@@ -74,6 +74,9 @@ static void mmc_test_prepare_mrq(struct mmc_test_card *test, 
	}



	mrq->cmd->arg = dev_addr;

	if (!mmc_card_blockaddr(test->card))

		mrq->cmd->arg <<= 9;



	mrq->cmd->flags = MMC_RSP_R1 | MMC_CMD_ADTC;



	if (blocks == 1)
@@ -190,7 +193,7 @@ static int __mmc_test_prepare(struct mmc_test_card *test, int write) 
	}



	for (i = 0;i < BUFFER_SIZE / 512;i++) {

		ret = mmc_test_buffer_transfer(test, test->buffer, i * 512, 512, 1);

		ret = mmc_test_buffer_transfer(test, test->buffer, i, 512, 1);

		if (ret)

			return ret;

	}
@@ -219,7 +222,7 @@ static int mmc_test_cleanup(struct mmc_test_card *test) 
	memset(test->buffer, 0, 512);



	for (i = 0;i < BUFFER_SIZE / 512;i++) {

		ret = mmc_test_buffer_transfer(test, test->buffer, i * 512, 512, 1);

		ret = mmc_test_buffer_transfer(test, test->buffer, i, 512, 1);

		if (ret)

			return ret;

	}
@@ -426,7 +429,7 @@ static int mmc_test_transfer(struct mmc_test_card *test, 
		for (i = 0;i < sectors;i++) {

			ret = mmc_test_buffer_transfer(test,

				test->buffer + i * 512,

				dev_addr + i * 512, 512, 0);

				dev_addr + i, 512, 0);

			if (ret)

				return ret;

		}