mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-27 03:10:12 +00:00
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: Johan Kristell <johan.kristell@axis.com> Cc: <linux-mmc@vger.kernel.org> Signed-off-by: Andrew Morton <akpm@linux-foundation.org> Signed-off-by: Linus Torvalds <torvalds@linux-foundation.org>
This commit is contained in:
parent
93716b9470
commit
c286d03cce
1 changed files with 6 additions and 3 deletions
|
@ -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;
|
||||
}
|
||||
|
|
Loading…
Reference in a new issue