Commit 0d69a880 authored Mar 20, 2017 by Adrian Hunter Committed by Greg Kroah-Hartman Mar 30, 2017

mmc: sdhci-pci: Do not disable interrupts in sdhci_intel_set_power



commit 027fb89e61054b4aedd962adb3e2003dec78a716 upstream.

Disabling interrupts for even a millisecond can cause problems for some
devices. That can happen when Intel host controllers wait for the present
state to propagate.

The spin lock is not necessary here. Anything that is racing with changes
to the I/O state is already broken. The mmc core already provides
synchronization via "claiming" the host.

Although the spin lock probably should be removed from the code paths that
lead to this point, such a patch would touch too much code to be suitable
for stable trees. Consequently, for this patch, just drop the spin lock
while waiting.

Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Tested-by: Ludovic Desroches <ludovic.desroches@microchip.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>

parent b43ba21b

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

+4 −0

Original line number	Diff line number	Diff line
		@@ -412,6 +412,8 @@ 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.
		@@ -424,6 +426,8 @@ 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 = {