diff options
| author | Andrei Warkentin <andreiw@motorola.com> | 2011-05-23 15:06:38 -0500 |
|---|---|---|
| committer | Chris Ball <cjb@laptop.org> | 2011-05-25 16:49:03 -0400 |
| commit | f0d89972b01798cf9d245dfa1cacfa0ee78a3593 (patch) | |
| tree | a3e69fc95825971384798eac4281148db837f891 /drivers/mmc | |
| parent | e89d456fcdde2df008c032bf928e69e628e07a28 (diff) | |
| download | linux-3.10-f0d89972b01798cf9d245dfa1cacfa0ee78a3593.tar.gz linux-3.10-f0d89972b01798cf9d245dfa1cacfa0ee78a3593.tar.bz2 linux-3.10-f0d89972b01798cf9d245dfa1cacfa0ee78a3593.zip | |
mmc: core: Block CMD23 support for UHS104/SDXC cards.
SD cards operating at UHS104 or better support SET_BLOCK_COUNT.
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
Reviewed-by: Arindam Nath <arindam.nath@amd.com>
Signed-off-by: Chris Ball <cjb@laptop.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/card/block.c | 9 | ||||
| -rw-r--r-- | drivers/mmc/core/sd.c | 2 |
2 files changed, 8 insertions, 3 deletions
diff --git a/drivers/mmc/card/block.c b/drivers/mmc/card/block.c index a380accaba9..71da5641e25 100644 --- a/drivers/mmc/card/block.c +++ b/drivers/mmc/card/block.c @@ -1057,9 +1057,12 @@ static struct mmc_blk_data *mmc_blk_alloc_req(struct mmc_card *card, blk_queue_logical_block_size(md->queue.queue, 512); set_capacity(md->disk, size); - if (mmc_host_cmd23(card->host) && - mmc_card_mmc(card)) - md->flags |= MMC_BLK_CMD23; + if (mmc_host_cmd23(card->host)) { + if (mmc_card_mmc(card) || + (mmc_card_sd(card) && + card->scr.cmds & SD_SCR_CMD23_SUPPORT)) + md->flags |= MMC_BLK_CMD23; + } if (mmc_card_mmc(card) && md->flags & MMC_BLK_CMD23 && diff --git a/drivers/mmc/core/sd.c b/drivers/mmc/core/sd.c index 596d0b9d30b..ff2774128aa 100644 --- a/drivers/mmc/core/sd.c +++ b/drivers/mmc/core/sd.c @@ -203,6 +203,8 @@ static int mmc_decode_scr(struct mmc_card *card) else card->erased_byte = 0x0; + if (scr->sda_spec3) + scr->cmds = UNSTUFF_BITS(resp, 32, 2); return 0; } |