renegade-project/linux-next
2
0
Fork 0
mirror of https://github.com/edk2-porting/linux-next.git synced 2024-12-28 07:04:00 +08:00
Code

mmc: block: Disable Command Queue while RPMB is used

Browse Source 
RPMB does not allow Command Queue commands. Disable and re-enable the
Command Queue when switching.

Note that the driver only switches partitions when the queue is empty.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Reviewed-by: Harjani Ritesh <riteshh@codeaurora.org>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Adrian Hunter 2017-03-13 14:36:39 +02:00 committed by Ulf Hansson
parent 9d4579a85c
commit 025e3d5fe1
1 changed files with 38 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
drivers/mmc/core/block.c
View File

@ -728,10 +728,41 @@ static const struct block_device_operations mmc_bdops = {
#endif #endif
}; };
static int mmc_blk_part_switch_pre(struct mmc_card *card,
unsigned int part_type)
{
int ret = 0;
if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) {
if (card->ext_csd.cmdq_en) {
ret = mmc_cmdq_disable(card);
if (ret)
return ret;
}
mmc_retune_pause(card->host);
}
return ret;
}
static int mmc_blk_part_switch_post(struct mmc_card *card,
unsigned int part_type)
{
int ret = 0;
if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) {
mmc_retune_unpause(card->host);
if (card->reenable_cmdq && !card->ext_csd.cmdq_en)
ret = mmc_cmdq_enable(card);
}
return ret;
}
static inline int mmc_blk_part_switch(struct mmc_card *card, static inline int mmc_blk_part_switch(struct mmc_card *card,
struct mmc_blk_data *md) struct mmc_blk_data *md)
{ {
int ret; int ret = 0;
struct mmc_blk_data *main_md = dev_get_drvdata(&card->dev); struct mmc_blk_data *main_md = dev_get_drvdata(&card->dev);
if (main_md->part_curr == md->part_type) if (main_md->part_curr == md->part_type)
@ -740,8 +771,9 @@ static inline int mmc_blk_part_switch(struct mmc_card *card,
if (mmc_card_mmc(card)) { if (mmc_card_mmc(card)) {
u8 part_config = card->ext_csd.part_config; u8 part_config = card->ext_csd.part_config;
if (md->part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) ret = mmc_blk_part_switch_pre(card, md->part_type);
mmc_retune_pause(card->host); if (ret)
return ret;
part_config &= ~EXT_CSD_PART_CONFIG_ACC_MASK; part_config &= ~EXT_CSD_PART_CONFIG_ACC_MASK;
part_config |= md->part_type; part_config |= md->part_type;
@ -750,19 +782,17 @@ static inline int mmc_blk_part_switch(struct mmc_card *card,
EXT_CSD_PART_CONFIG, part_config, EXT_CSD_PART_CONFIG, part_config,
card->ext_csd.part_time); card->ext_csd.part_time);
if (ret) { if (ret) {
if (md->part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) mmc_blk_part_switch_post(card, md->part_type);
mmc_retune_unpause(card->host);
return ret; return ret;
} }
card->ext_csd.part_config = part_config; card->ext_csd.part_config = part_config;
if (main_md->part_curr == EXT_CSD_PART_CONFIG_ACC_RPMB) ret = mmc_blk_part_switch_post(card, main_md->part_curr);
mmc_retune_unpause(card->host);
} }
main_md->part_curr = md->part_type; main_md->part_curr = md->part_type;
return 0; return ret;
} }
static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks) static int mmc_sd_num_wr_blocks(struct mmc_card *card, u32 *written_blocks)