Merge "mmc: core: Update check for enhanced rpmb support" (e3661924) · Commits · e / devices / android_kernel_fairphone_FP3

drivers/mmc/core/mmc.c

+7 −3

Original line number	Diff line number	Diff line
		@@ -685,9 +685,6 @@ static int mmc_decode_ext_csd(struct mmc_card card, u8 ext_csd)
		mmc_hostname(card->host),
		card->ext_csd.barrier_support,
		card->ext_csd.cache_flush_policy);
		card->ext_csd.enhanced_rpmb_supported =
		(card->ext_csd.rel_param &
		EXT_CSD_WR_REL_PARAM_EN_RPMB_REL_WR);
		} else {
		card->ext_csd.cmdq_support = 0;
		card->ext_csd.cmdq_depth = 0;
		@@ -709,6 +706,13 @@ static int mmc_decode_ext_csd(struct mmc_card card, u8 ext_csd)
		card->ext_csd.device_life_time_est_typ_b =
		ext_csd[EXT_CSD_DEVICE_LIFE_TIME_EST_TYP_B];
		}

		/* eMMC v5.1 or later */
		if (card->ext_csd.rev >= 8)
		card->ext_csd.enhanced_rpmb_supported =
		(card->ext_csd.rel_param &
		EXT_CSD_WR_REL_PARAM_EN_RPMB_REL_WR);

		out:
		return err;
		}