mmc: core: Allow BKOPS and CACHE ctrl even if no HPI support (ba9f39a7) · Commits · 戴 / test

In commit ("mmc: core: Disable HPI for certain Hynix eMMC cards"), then intent was to prevent HPI from being used for some eMMC cards, which didn't properly support it. However, that went too far, as even BKOPS and CACHE ctrl became prevented. Let's restore those parts and allow BKOPS and CACHE ctrl even if HPI isn't supported. Fixes: ("mmc: core: Disable HPI for certain Hynix eMMC cards") Cc: Pratibhasagar V <pratibha@codeaurora.org> Cc: <stable@vger.kernel.org> Signed-off-by:

Ulf Hansson <ulf.hansson@linaro.org>

drivers/mmc/core/mmc.c

+2 −4

Original line number	Diff line number	Diff line
		@@ -526,8 +526,7 @@ static int mmc_decode_ext_csd(struct mmc_card card, u8 ext_csd)
		card->cid.year += 16;

		/* check whether the eMMC card supports BKOPS */
		if (!mmc_card_broken_hpi(card) &&
		ext_csd[EXT_CSD_BKOPS_SUPPORT] & 0x1) {
		if (ext_csd[EXT_CSD_BKOPS_SUPPORT] & 0x1) {
		card->ext_csd.bkops = 1;
		card->ext_csd.man_bkops_en =
		(ext_csd[EXT_CSD_BKOPS_EN] &
		@@ -1793,8 +1792,7 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
		* If cache size is higher than 0, this indicates
		* the existence of cache and it can be turned on.
		*/
		if (!mmc_card_broken_hpi(card) &&
		card->ext_csd.cache_size > 0) {
		if (card->ext_csd.cache_size > 0) {
		err = mmc_switch(card, EXT_CSD_CMD_SET_NORMAL,
		EXT_CSD_CACHE_CTRL, 1,
		card->ext_csd.generic_cmd6_time);

Admin message