Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d9d4222d authored by Pradeep P V K's avatar Pradeep P V K
Browse files

mmc: host: Check for reset prior to DMA address unmap 



Upon any command errors we should do a CMD and DAT reset
prior to DMA unmap but the current logic is other way.

So, with the existing change it could possible to access the
unmapped address before resetting and this leads to SMMU unmapped
address access faults. So, check for reset prior to DMA unmap.

Change-Id: I89a751118b00df1c952693a713cb5060739a0ed5
Suggested-by: default avatarVeerabhadrarao Badiganti <vbadigan@codeaurora.org>
Signed-off-by: default avatarPradeep P V K <pragalla@codeaurora.org>
parent 84df7e40

drivers/mmc/host/sdhci.c

+31 −29
Original line number Diff line number Diff line
@@ -2833,6 +2833,37 @@ static bool sdhci_request_done(struct sdhci_host *host) 
		return true;

	}



	/*

	 * The controller needs a reset of internal state machines

	 * upon error conditions.

	 */

	if (sdhci_needs_reset(host, mrq)) {

		/*

		 * Do not finish until command and data lines are available for

		 * reset. Note there can only be one other mrq, so it cannot

		 * also be in mrqs_done, otherwise host->cmd and host->data_cmd

		 * would both be null.

		 */

		if (host->cmd || host->data_cmd) {

			spin_unlock_irqrestore(&host->lock, flags);

			return true;

		}



		/* Some controllers need this kick or reset won't work here */

		if (host->quirks & SDHCI_QUIRK_CLOCK_BEFORE_RESET)

			/* This is to force an update */

			host->ops->set_clock(host, host->clock);



		/*

		 * Spec says we should do both at the same time, but Ricoh

		 * controllers do not like that.

		 */

		sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);



		host->pending_reset = false;

	}



	/*

	 * Always unmap the data buffers if they were mapped by

	 * sdhci_prepare_data() whenever we finish with a request.
@@ -2885,35 +2916,6 @@ static bool sdhci_request_done(struct sdhci_host *host) 
		}

	}



	/*

	 * The controller needs a reset of internal state machines

	 * upon error conditions.

	 */

	if (sdhci_needs_reset(host, mrq)) {

		/*

		 * Do not finish until command and data lines are available for

		 * reset. Note there can only be one other mrq, so it cannot

		 * also be in mrqs_done, otherwise host->cmd and host->data_cmd

		 * would both be null.

		 */

		if (host->cmd || host->data_cmd) {

			spin_unlock_irqrestore(&host->lock, flags);

			return true;

		}



		/* Some controllers need this kick or reset won't work here */

		if (host->quirks & SDHCI_QUIRK_CLOCK_BEFORE_RESET)

			/* This is to force an update */

			host->ops->set_clock(host, host->clock);



		/* Spec says we should do both at the same time, but Ricoh

		   controllers do not like that. */

		sdhci_do_reset(host, SDHCI_RESET_CMD);

		sdhci_do_reset(host, SDHCI_RESET_DATA);



		host->pending_reset = false;

	}



	host->mrqs_done[i] = NULL;



	spin_unlock_irqrestore(&host->lock, flags);