Commit e7794c14 authored by Jorge Ramirez-Ortiz's avatar Jorge Ramirez-Ortiz Committed by Ulf Hansson

mmc: rpmb: fixes pause retune on all RPMB partitions.

When RPMB was converted to a character device, it added support for
multiple RPMB partitions (Commit 97548575 ("mmc: block: Convert RPMB to
a character device").

One of the changes in this commit was transforming the variable target_part
defined in __mmc_blk_ioctl_cmd into a bitmask. This inadvertently regressed
the validation check done in mmc_blk_part_switch_pre() and
mmc_blk_part_switch_post(), so let's fix it.

Fixes: 97548575 ("mmc: block: Convert RPMB to a character device")
Signed-off-by: default avatarJorge Ramirez-Ortiz <jorge@foundries.io>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20231201153143.1449753-1-jorge@foundries.ioSigned-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parent 8c124d99
...@@ -851,9 +851,10 @@ static const struct block_device_operations mmc_bdops = { ...@@ -851,9 +851,10 @@ static const struct block_device_operations mmc_bdops = {
static int mmc_blk_part_switch_pre(struct mmc_card *card, static int mmc_blk_part_switch_pre(struct mmc_card *card,
unsigned int part_type) unsigned int part_type)
{ {
const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_RPMB;
int ret = 0; int ret = 0;
if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) { if ((part_type & mask) == mask) {
if (card->ext_csd.cmdq_en) { if (card->ext_csd.cmdq_en) {
ret = mmc_cmdq_disable(card); ret = mmc_cmdq_disable(card);
if (ret) if (ret)
...@@ -868,9 +869,10 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card, ...@@ -868,9 +869,10 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card,
static int mmc_blk_part_switch_post(struct mmc_card *card, static int mmc_blk_part_switch_post(struct mmc_card *card,
unsigned int part_type) unsigned int part_type)
{ {
const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_RPMB;
int ret = 0; int ret = 0;
if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) { if ((part_type & mask) == mask) {
mmc_retune_unpause(card->host); mmc_retune_unpause(card->host);
if (card->reenable_cmdq && !card->ext_csd.cmdq_en) if (card->reenable_cmdq && !card->ext_csd.cmdq_en)
ret = mmc_cmdq_enable(card); ret = mmc_cmdq_enable(card);
...@@ -3145,4 +3147,3 @@ module_exit(mmc_blk_exit); ...@@ -3145,4 +3147,3 @@ module_exit(mmc_blk_exit);
MODULE_LICENSE("GPL"); MODULE_LICENSE("GPL");
MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver"); MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver");
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment