Commit 32e8ee2d authored by Ulf Hansson's avatar Ulf Hansson
Browse files

mmc: Merge branch fixes into next 



Merge the mmc fixes for v6.8-rc[n] into the next branch, to allow them to
get tested together with the new mmc changes that are targeted for v6.9.

Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
parents 0cd8fd15 4af59a8d

drivers/mmc/core/block.c

+6 −4
Original line number Diff line number Diff line
@@ -874,10 +874,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)
@@ -892,10 +893,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);