summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorBalaji T K <balajitk@ti.com>2013-01-25 17:00:30 +0530
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2013-02-28 05:38:40 -0800
commit2c3c78916a91b01d0571fbc1ae7434ca3c2d2288 (patch)
tree75f906669d48c83f1cbfc2e5b014321fff63125e
parent2f98d7620e47046548073bf3029f1af7a0f2d7b0 (diff)
downloadlinux-stable-2c3c78916a91b01d0571fbc1ae7434ca3c2d2288.tar.gz
linux-stable-2c3c78916a91b01d0571fbc1ae7434ca3c2d2288.tar.bz2
linux-stable-2c3c78916a91b01d0571fbc1ae7434ca3c2d2288.zip
mmc: core: expose RPMB partition only for CMD23 capable hosts
commit d0123ccac55088811bde4f76c4a3fdbd39c3cfba upstream. SET_BLOCK_COUNT CMD23 is needed for all access to RPMB partition. If block count is not set by CMD23, all subsequent read/write commands fail as per eMMC specification. So, If the host does not support CMD23, do not expose RPMB partition. Accessing RPMB partition can cause hang / huge delay for hosts which do not support CMD23. Signed-off-by: Balaji T K <balajitk@ti.com> Reported-and-Tested-by: Peter Ujfalusi <peter.ujfalusi@ti.com> Signed-off-by: Chris Ball <cjb@laptop.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/mmc/core/mmc.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/mmc/core/mmc.c b/drivers/mmc/core/mmc.c
index e6e39111e05b..089e8ea34812 100644
--- a/drivers/mmc/core/mmc.c
+++ b/drivers/mmc/core/mmc.c
@@ -496,7 +496,7 @@ static int mmc_read_ext_csd(struct mmc_card *card, u8 *ext_csd)
* RPMB regions are defined in multiples of 128K.
*/
card->ext_csd.raw_rpmb_size_mult = ext_csd[EXT_CSD_RPMB_MULT];
- if (ext_csd[EXT_CSD_RPMB_MULT]) {
+ if (ext_csd[EXT_CSD_RPMB_MULT] && mmc_host_cmd23(card->host)) {
mmc_part_add(card, ext_csd[EXT_CSD_RPMB_MULT] << 17,
EXT_CSD_PART_CONFIG_ACC_RPMB,
"rpmb", 0, false,