Commit 8af6fad4 authored Dec 10, 2018 by Ulf Hansson Committed by Greg Kroah-Hartman Dec 29, 2018

mmc: core: Reset HPI enabled state during re-init and in case of errors



commit a0741ba40a009f97c019ae7541dc61c1fdf41efb upstream.

During a re-initialization of the eMMC card, we may fail to re-enable HPI.
In these cases, that isn't properly reflected in the card->ext_csd.hpi_en
bit, as it keeps being set. This may cause following attempts to use HPI,
even if's not enabled. Let's fix this!

Fixes: eb0d8f13 ("mmc: core: support HPI send command")
Cc: <stable@vger.kernel.org>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent fe646761

drivers/mmc/core/mmc.c

+3 −1

Original line number	Diff line number	Diff line
		@@ -1755,10 +1755,12 @@ static int mmc_init_card(struct mmc_host *host, u32 ocr,
		if (err) {
		pr_warn("%s: Enabling HPI failed\n",
		mmc_hostname(card->host));
		card->ext_csd.hpi_en = 0;
		err = 0;
		} else
		} else {
		card->ext_csd.hpi_en = 1;
		}
		}

		/*
		* If cache size is higher than 0, this indicates