aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorLoic Pallardy <loic.pallardy-ext@stericsson.com>2012-08-06 11:12:30 -0400
committerChris Ball <cjb@laptop.org>2012-12-06 13:54:48 -0500
commit67c79db8d9c0e5d2e2075c9108f42566ce0f8a6f (patch)
treea54d009c61dc3002e54efc366be988b5a5a3dd08
parent188cc0424e9bd7733ee3e412da6df2cf42701061 (diff)
mmc: core: Add mmc_set_blockcount feature
Provide support for automatically sending Set Block Count (CMD23) messages. Used at least for RPMB support. Signed-off-by: Alex Macro <alex.macro@stericsson.com> Signed-off-by: Loic Pallardy <loic.pallardy@stericsson.com> Reviewed-by: Namjae Jeon <linkinjeon@gmail.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Johan Rudholm <johan.rudholm@stericsson.com> Acked-by: Krishna Konda <kkonda@codeaurora.org> Signed-off-by: Chris Ball <cjb@laptop.org>
-rw-r--r--drivers/mmc/core/core.c14
-rw-r--r--include/linux/mmc/core.h2
2 files changed, 16 insertions, 0 deletions
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index bccfd1858b0..aaed7687cf0 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1958,6 +1958,20 @@ int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen)
1958} 1958}
1959EXPORT_SYMBOL(mmc_set_blocklen); 1959EXPORT_SYMBOL(mmc_set_blocklen);
1960 1960
1961int mmc_set_blockcount(struct mmc_card *card, unsigned int blockcount,
1962 bool is_rel_write)
1963{
1964 struct mmc_command cmd = {0};
1965
1966 cmd.opcode = MMC_SET_BLOCK_COUNT;
1967 cmd.arg = blockcount & 0x0000FFFF;
1968 if (is_rel_write)
1969 cmd.arg |= 1 << 31;
1970 cmd.flags = MMC_RSP_SPI_R1 | MMC_RSP_R1 | MMC_CMD_AC;
1971 return mmc_wait_for_cmd(card->host, &cmd, 5);
1972}
1973EXPORT_SYMBOL(mmc_set_blockcount);
1974
1961static void mmc_hw_reset_for_init(struct mmc_host *host) 1975static void mmc_hw_reset_for_init(struct mmc_host *host)
1962{ 1976{
1963 if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset) 1977 if (!(host->caps & MMC_CAP_HW_RESET) || !host->ops->hw_reset)
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 9b9cdafc773..5bf7c2274fc 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -170,6 +170,8 @@ extern int mmc_erase_group_aligned(struct mmc_card *card, unsigned int from,
170extern unsigned int mmc_calc_max_discard(struct mmc_card *card); 170extern unsigned int mmc_calc_max_discard(struct mmc_card *card);
171 171
172extern int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen); 172extern int mmc_set_blocklen(struct mmc_card *card, unsigned int blocklen);
173extern int mmc_set_blockcount(struct mmc_card *card, unsigned int blockcount,
174 bool is_rel_write);
173extern int mmc_hw_reset(struct mmc_host *host); 175extern int mmc_hw_reset(struct mmc_host *host);
174extern int mmc_hw_reset_check(struct mmc_host *host); 176extern int mmc_hw_reset_check(struct mmc_host *host);
175extern int mmc_can_reset(struct mmc_card *card); 177extern int mmc_can_reset(struct mmc_card *card);