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

Commit 7aa702be authored by Venkat Gopalakrishnan's avatar Venkat Gopalakrishnan
Browse files

mmc: sdhci: disable pm qos voting when in cmdq mode 



pm qos is currently causing race conditions with runtime pm when
in cmdq mode. Disable this till it is addressed as part of the
pm qos redesign.

Change-Id: I32d04100bbf31995a249188eace164c8761e9141
Signed-off-by: default avatarVenkat Gopalakrishnan <venkatg@codeaurora.org>
parent 7af2265a

drivers/mmc/host/sdhci.c

+6 −2
Original line number Diff line number Diff line
@@ -1509,9 +1509,12 @@ static int sdhci_enable(struct mmc_host *mmc) 
{

	struct sdhci_host *host = mmc_priv(mmc);



	if (host->cpu_dma_latency_us)

	if (mmc->card && !mmc_card_cmdq(mmc->card) &&

	    (host->cpu_dma_latency_us)) {

		pm_qos_update_request(&host->pm_qos_req_dma,

					host->cpu_dma_latency_us);

	}



	if (host->ops->platform_bus_voting)

		host->ops->platform_bus_voting(host, 1);
@@ -1522,7 +1525,8 @@ static int sdhci_disable(struct mmc_host *mmc) 
{

	struct sdhci_host *host = mmc_priv(mmc);



	if (host->cpu_dma_latency_us) {

	if (mmc->card && !mmc_card_cmdq(mmc->card) &&

	    (host->cpu_dma_latency_us)) {

		/*

		 * In performance mode, release QoS vote after a timeout to

		 * make sure back-to-back requests don't suffer from latencies