Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d7bc1877 authored by Dominique Martinet's avatar Dominique Martinet Committed by Greg Kroah-Hartman
Browse files

mmc: core: Fix switch on gp3 partition 



[ Upstream commit 4af59a8df5ea930038cd3355e822f5eedf4accc1 ]

Commit e7794c14fd73 ("mmc: rpmb: fixes pause retune on all RPMB
partitions.") added a mask check for 'part_type', but the mask used was
wrong leading to the code intended for rpmb also being executed for GP3.

On some MMCs (but not all) this would make gp3 partition inaccessible:
armadillo:~# head -c 1 < /dev/mmcblk2gp3
head: standard input: I/O error
armadillo:~# dmesg -c
[  422.976583] mmc2: running CQE recovery
[  423.058182] mmc2: running CQE recovery
[  423.137607] mmc2: running CQE recovery
[  423.137802] blk_update_request: I/O error, dev mmcblk2gp3, sector 0 op 0x0:(READ) flags 0x80700 phys_seg 4 prio class 0
[  423.237125] mmc2: running CQE recovery
[  423.318206] mmc2: running CQE recovery
[  423.397680] mmc2: running CQE recovery
[  423.397837] blk_update_request: I/O error, dev mmcblk2gp3, sector 0 op 0x0:(READ) flags 0x0 phys_seg 1 prio class 0
[  423.408287] Buffer I/O error on dev mmcblk2gp3, logical block 0, async page read

the part_type values of interest here are defined as follow:
main  0
boot0 1
boot1 2
rpmb  3
gp0   4
gp1   5
gp2   6
gp3   7

so mask with EXT_CSD_PART_CONFIG_ACC_MASK (7) to correctly identify rpmb

Fixes: e7794c14fd73 ("mmc: rpmb: fixes pause retune on all RPMB partitions.")
Cc: stable@vger.kernel.org
Cc: Jorge Ramirez-Ortiz <jorge@foundries.io>
Signed-off-by: default avatarDominique Martinet <dominique.martinet@atmark-techno.com>
Reviewed-by: default avatarLinus Walleij <linus.walleij@linaro.org>
Link: https://lore.kernel.org/r/20240306-mmc-partswitch-v1-1-bf116985d950@codewreck.org


Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent 24019e5a

drivers/mmc/core/block.c

+6 −4
Original line number Diff line number Diff line
@@ -873,10 +873,11 @@ 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;

	const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_MASK;

	const unsigned int rpmb = EXT_CSD_PART_CONFIG_ACC_RPMB;

	int ret = 0;



	if ((part_type & mask) == mask) {

	if ((part_type & mask) == rpmb) {

		if (card->ext_csd.cmdq_en) {

			ret = mmc_cmdq_disable(card);

			if (ret)
@@ -891,10 +892,11 @@ 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;

	const unsigned int mask = EXT_CSD_PART_CONFIG_ACC_MASK;

	const unsigned int rpmb = EXT_CSD_PART_CONFIG_ACC_RPMB;

	int ret = 0;



	if ((part_type & mask) == mask) {

	if ((part_type & mask) == rpmb) {

		mmc_retune_unpause(card->host);

		if (card->reenable_cmdq && !card->ext_csd.cmdq_en)

			ret = mmc_cmdq_enable(card);