Commit da366a42 authored by Jorge Ramirez-Ortiz's avatar Jorge Ramirez-Ortiz Committed by sanglipeng1
Browse files

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

stable inclusion
from stable-v5.10.208
commit c29da60e1f6b25ed4ab4d57db77c44afc9a9f4e7
category: bugfix
bugzilla: https://gitee.com/openeuler/kernel/issues/I9T22K

Reference: https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git/commit/?id=c29da60e1f6b25ed4ab4d57db77c44afc9a9f4e7



--------------------------------

commit e7794c14fd73e5eb4a3e0ecaa5334d5a17377c50 upstream.

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.io


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Signed-off-by: default avatarsanglipeng1 <sanglipeng1@jd.com>
parent bd1d6d9a

drivers/mmc/core/block.c

+4 −3
Original line number Diff line number Diff line
@@ -800,9 +800,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)
@@ -817,9 +818,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);
@@ -3102,4 +3104,3 @@ module_exit(mmc_blk_exit); 


MODULE_LICENSE("GPL");

MODULE_DESCRIPTION("Multimedia Card (MMC) block device driver");