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

commit e7794c14fd73e5eb4a3e0ecaa5334d5a17377c50 upstream.

When RPMB was converted to a character device, it added support for
multiple RPMB partitions (Commit 97548575bef3 ("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: 97548575bef3 ("mmc: block: Convert RPMB to a character device")
Signed-off-by: Jorge Ramirez-Ortiz <jorge@foundries.io>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Cc: <stable@vger.kernel.org>
Link: https://lore.kernel.org/r/20231201153143.1449753-1-jorge@foundries.io
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index 770490234c87225ae353bea18e9df844f1990ab3..e9ce53d200bc1d6deee71b4a35dc6fda6a502b9e 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -866,9 +866,10 @@ static const struct block_device_operations mmc_bdops = {
 static int mmc_blk_part_switch_pre(struct mmc_card *card,
                                   unsigned int part_type)
 {
+       const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_RPMB;
        int ret = 0;
 
-       if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) {
+       if ((part_type & mask) == mask) {
                if (card->ext_csd.cmdq_en) {
                        ret = mmc_cmdq_disable(card);
                        if (ret)
@@ -883,9 +884,10 @@ static int mmc_blk_part_switch_pre(struct mmc_card *card,
 static int mmc_blk_part_switch_post(struct mmc_card *card,
                                    unsigned int part_type)
 {
+       const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_RPMB;
        int ret = 0;
 
-       if (part_type == EXT_CSD_PART_CONFIG_ACC_RPMB) {
+       if ((part_type & mask) == mask) {
                mmc_retune_unpause(card->host);
                if (card->reenable_cmdq && !card->ext_csd.cmdq_en)
                        ret = mmc_cmdq_enable(card);
@@ -3180,4 +3182,3 @@ module_exit(mmc_blk_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver");
-