mmc: rpmb: fixes pause retune on all RPMB partitions.
Subsystems (2)
PATCH v3 1/1 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 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 inadvertedly regressed the validation check done in mmc_blk_part_switch_pre() and mmc_blk_part_switch_post().
This commit fixes that regression.
---
v2:
fixes parenthesis around condition
v3:
adds stable to commit header
drivers/mmc/core/block.c | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-)
drivers/mmc/core/block.c +4 -3
@@ -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);
@@ -3143,4 +3145,3 @@ module_exit(mmc_blk_exit);MODULE_LICENSE ("GPL" );MODULE_DESCRIPTION ("Multimedia Card (MMC) block device driver" ); -
--
2.34.1
Greg KH
maintainerQuoted 7 lines · Jorge Ramirez-Ortiz
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_partdefined in__mmc_blk_ioctl_cmdinto a bitmask.
Quoted 8 lines
This inadvertedly regressed the validation check done in
mmc_blk_part_switch_pre()andmmc_blk_part_switch_post().This commit fixes that regression.
Fixes 97548575bef3 ("mmc: block: Convert RPMB to a character device")Signed-off-by Jorge Ramirez-Ortiz <[email protected]>Cc <[email protected]> # v6.0+
Why only 6.0 when the "Fixes:" tag goes back to a 4.14 commit?
thanks,
greg k-h
Quoted 11 lines · Greg KH
Quoted 10 lines · Jorge Ramirez-Ortiz
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_partdefined in__mmc_blk_ioctl_cmdinto a bitmask.This inadvertedly regressed the validation check done in
mmc_blk_part_switch_pre()andmmc_blk_part_switch_post().
Quoted 7 lines
Quoted 5 lines
This commit fixes that regression.
Fixes 97548575bef3 ("mmc: block: Convert RPMB to a character device")Signed-off-by Jorge Ramirez-Ortiz <[email protected]>Cc <[email protected]> # v6.0+Why only 6.0 when the "Fixes:" tag goes back to a 4.14 commit?
ops so sorry (was WIP and got distracted press sent and forgot), will fix and add Linus' Reviewed-by.
Quoted 4 lines
thanks,
greg k-h
Quoted 7 lines · Jorge Ramirez-Ortiz
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_partdefined in__mmc_blk_ioctl_cmdinto a bitmask.
Quoted 8 lines
This inadvertedly regressed the validation check done in
mmc_blk_part_switch_pre()andmmc_blk_part_switch_post().This commit fixes that regression.
Fixes 97548575bef3 ("mmc: block: Convert RPMB to a character device")Signed-off-by Jorge Ramirez-Ortiz <[email protected]>Cc <[email protected]> # v6.0+
Yours,
Linus Walleij