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

Commit d1e4f74f authored by Adrian Hunter's avatar Adrian Hunter Committed by Ulf Hansson
Browse files

mmc: sdhci: Do not use spin lock in set_ios paths 



The spin lock is not necessary in set_ios. Anything that is racing with
changes to the I/O state is already broken. The mmc core already provides
synchronization via "claiming" the host. So remove spin_lock and friends
from sdhci_set_ios and related callbacks.

Signed-off-by: default avatarAdrian Hunter <adrian.hunter@intel.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
Tested-by: default avatarLudovic Desroches <ludovic.desroches@microchip.com>
parent 0c62e675

drivers/mmc/host/sdhci-msm.c

+0 −8
Original line number Diff line number Diff line
@@ -991,12 +991,8 @@ static void sdhci_msm_set_uhs_signaling(struct sdhci_host *host, 
		mmc_hostname(host->mmc), host->clock, uhs, ctrl_2);

	sdhci_writew(host, ctrl_2, SDHCI_HOST_CONTROL2);



	spin_unlock_irq(&host->lock);



	if (mmc->ios.timing == MMC_TIMING_MMC_HS400)

		sdhci_msm_hs400(host, &mmc->ios);



	spin_lock_irq(&host->lock);

}



static void sdhci_msm_voltage_switch(struct sdhci_host *host)
@@ -1089,13 +1085,9 @@ static void sdhci_msm_set_clock(struct sdhci_host *host, unsigned int clock) 
		goto out;

	}



	spin_unlock_irq(&host->lock);



	sdhci_msm_hc_select_mode(host);



	msm_set_clock_rate_for_bus_mode(host, clock);



	spin_lock_irq(&host->lock);

out:

	__sdhci_msm_set_clock(host, clock);

}

drivers/mmc/host/sdhci-of-arasan.c

+0 −6
Original line number Diff line number Diff line
@@ -194,9 +194,7 @@ static void sdhci_arasan_set_clock(struct sdhci_host *host, unsigned int clock) 
			 * through low speeds without power cycling.

			 */

			sdhci_set_clock(host, host->max_clk);

			spin_unlock_irq(&host->lock);

			phy_power_on(sdhci_arasan->phy);

			spin_lock_irq(&host->lock);

			sdhci_arasan->is_phy_on = true;



			/*
@@ -215,18 +213,14 @@ static void sdhci_arasan_set_clock(struct sdhci_host *host, unsigned int clock) 
	}



	if (ctrl_phy && sdhci_arasan->is_phy_on) {

		spin_unlock_irq(&host->lock);

		phy_power_off(sdhci_arasan->phy);

		spin_lock_irq(&host->lock);

		sdhci_arasan->is_phy_on = false;

	}



	sdhci_set_clock(host, clock);



	if (ctrl_phy) {

		spin_unlock_irq(&host->lock);

		phy_power_on(sdhci_arasan->phy);

		spin_lock_irq(&host->lock);

		sdhci_arasan->is_phy_on = true;

	}

}

drivers/mmc/host/sdhci-of-at91.c

+0 −2
Original line number Diff line number Diff line
@@ -98,9 +98,7 @@ static void sdhci_at91_set_power(struct sdhci_host *host, unsigned char mode, 
	if (!IS_ERR(host->mmc->supply.vmmc)) {

		struct mmc_host *mmc = host->mmc;



		spin_unlock_irq(&host->lock);

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		spin_lock_irq(&host->lock);

	}

	sdhci_set_power_noreg(host, mode, vdd);

}

drivers/mmc/host/sdhci-pci-core.c

+0 −4
Original line number Diff line number Diff line
@@ -484,8 +484,6 @@ static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode, 
	if (mode == MMC_POWER_OFF)

		return;



	spin_unlock_irq(&host->lock);



	/*

	 * Bus power might not enable after D3 -> D0 transition due to the

	 * present state not yet having propagated. Retry for up to 2ms.
@@ -498,8 +496,6 @@ static void sdhci_intel_set_power(struct sdhci_host *host, unsigned char mode, 
		reg |= SDHCI_POWER_ON;

		sdhci_writeb(host, reg, SDHCI_POWER_CONTROL);

	}



	spin_lock_irq(&host->lock);

}



static const struct sdhci_ops sdhci_intel_byt_ops = {

drivers/mmc/host/sdhci-pxav3.c

+1 −4
Original line number Diff line number Diff line
@@ -323,11 +323,8 @@ static void pxav3_set_power(struct sdhci_host *host, unsigned char mode, 
	if (host->pwr == 0)

		vdd = 0;



	if (!IS_ERR(mmc->supply.vmmc)) {

		spin_unlock_irq(&host->lock);

	if (!IS_ERR(mmc->supply.vmmc))

		mmc_regulator_set_ocr(mmc, mmc->supply.vmmc, vdd);

		spin_lock_irq(&host->lock);

	}

}



static const struct sdhci_ops pxav3_sdhci_ops = {