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

[platform/kernel/linux-rpi.git] / drivers / mmc / core / block.c

diff --git a/drivers/mmc/core/block.c b/drivers/mmc/core/block.c
index f9a5cff..134c36e 100644 (file)
--- a/drivers/mmc/core/block.c
+++ b/drivers/mmc/core/block.c
@@ -851,9 +851,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)
@@ -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,
                                    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);
@@ -3145,4 +3147,3 @@ module_exit(mmc_blk_exit);
 
 MODULE_LICENSE("GPL");
 MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver");
-