Commit 44baa458 authored by Jisheng Zhang's avatar Jisheng Zhang Committed by Luis Henriques

mmc: sdhci-pxav3: fix race between runtime pm and irq

commit 3bb10f60 upstream.

This patch is to fix a race condition that may cause an unhandled irq,
which results in big sdhci interrupt numbers and endless "mmc1: got irq
while runtime suspended" msgs before v3.15.

Consider following scenario:

      CPU0                            CPU1
                              sdhci_pxav3_runtime_suspend()
                               spin_lock_irqsave(&host->lock, flags);
 sdhci_irq()
  spining on the &host->lock
                               host->runtime_suspended = true;
                               spin_unlock_irqrestore(&host->lock, flags);
  get the &host->lock
  runtime_suspended is true now
  return IRQ_NONE;

Fix this race by using the core sdhci.c supplied sdhci_runtime_suspend_host()
in runtime suspend hook which will disable card interrupts. We also use the
sdhci_runtime_resume_host() in the runtime resume hook accordingly.
Signed-off-by: default avatarJisheng Zhang <jszhang@marvell.com>
Signed-off-by: default avatarUlf Hansson <ulf.hansson@linaro.org>
[ luis: backported to 3.16: adjusted context ]
Signed-off-by: default avatarLuis Henriques <luis.henriques@canonical.com>
parent 8aaf3727
...@@ -448,11 +448,11 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev) ...@@ -448,11 +448,11 @@ static int sdhci_pxav3_runtime_suspend(struct device *dev)
{ {
struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
unsigned long flags; int ret;
spin_lock_irqsave(&host->lock, flags); ret = sdhci_runtime_suspend_host(host);
host->runtime_suspended = true; if (ret)
spin_unlock_irqrestore(&host->lock, flags); return ret;
clk_disable_unprepare(pltfm_host->clk); clk_disable_unprepare(pltfm_host->clk);
...@@ -463,15 +463,10 @@ static int sdhci_pxav3_runtime_resume(struct device *dev) ...@@ -463,15 +463,10 @@ static int sdhci_pxav3_runtime_resume(struct device *dev)
{ {
struct sdhci_host *host = dev_get_drvdata(dev); struct sdhci_host *host = dev_get_drvdata(dev);
struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host); struct sdhci_pltfm_host *pltfm_host = sdhci_priv(host);
unsigned long flags;
clk_prepare_enable(pltfm_host->clk); clk_prepare_enable(pltfm_host->clk);
spin_lock_irqsave(&host->lock, flags); return sdhci_runtime_resume_host(host);
host->runtime_suspended = false;
spin_unlock_irqrestore(&host->lock, flags);
return 0;
} }
#endif #endif
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment