[PATCH-Resend] mmc_test: block addressed cards

Johan Kristell
2010-02-01T12:05:08Z

The tests in mmc_test assumes that all cards are byte addressable.
This patch updates the tests to also work with cards that use block
addresses.

Signed-off-by: Johan Kristell <johan.kristell@axis.com>
---

--- linux-2.6/drivers/mmc/card/mmc_test.c 2010-01-11 10:57:02.000000000 +0100
+++ linux-2.6-devel/drivers/mmc/card/mmc_test.c 2010-01-11 09:52:42.000000000 +0100
@@ -74,6 +74,9 @@ static void mmc_test_prepare_mrq(struct
}

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
}

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_t
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_
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;
}