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

Commit 760b0cff authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "mmc: core: Ignore CRC errors with CMD13 while executing tuning"

parents c448cc7d 4726af1d

drivers/mmc/core/host.c

+2 −0
Original line number Diff line number Diff line
@@ -319,6 +319,7 @@ void mmc_retune_enable(struct mmc_host *host) 
		mod_timer(&host->retune_timer,

			  jiffies + host->retune_period * HZ);

}

EXPORT_SYMBOL(mmc_retune_enable);



void mmc_retune_disable(struct mmc_host *host)

{
@@ -327,6 +328,7 @@ void mmc_retune_disable(struct mmc_host *host) 
	host->retune_now = 0;

	host->need_retune = 0;

}

EXPORT_SYMBOL(mmc_retune_disable);



void mmc_retune_timer_stop(struct mmc_host *host)

{

drivers/mmc/host/sdhci.c

+6 −0
Original line number Diff line number Diff line
@@ -2456,7 +2456,13 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode) 


	if (host->ops->platform_execute_tuning) {

		spin_unlock_irqrestore(&host->lock, flags);

		/*

		 * Make sure re-tuning won't get triggered for the CRC errors

		 * occurred while executing tuning

		 */

		mmc_retune_disable(mmc);

		err = host->ops->platform_execute_tuning(host, opcode);

		mmc_retune_enable(mmc);

		sdhci_runtime_pm_put(host);

		return err;

	}

include/linux/mmc/host.h

+2 −0
Original line number Diff line number Diff line
@@ -833,6 +833,8 @@ static inline bool mmc_card_hs400(struct mmc_card *card) 
	return card->host->ios.timing == MMC_TIMING_MMC_HS400;

}



void mmc_retune_enable(struct mmc_host *host);

void mmc_retune_disable(struct mmc_host *host);

void mmc_retune_timer_stop(struct mmc_host *host);



static inline void mmc_retune_needed(struct mmc_host *host)