Fix MMIO vs memory races in sdhci
PATCH 1/1 Fix MMIO vs memory races in sdhci
Sprinkle some mmiowb() where needed (writeX() before unlock()).
Signed-off-by Pierre Ossman <[email protected]>
---
drivers/mmc/sdhci.c | 8 ++++++++ 1 files changed, 8 insertions(+), 0 deletions(-)
drivers/mmc/sdhci.c +8 -0
@@ -717,6 +717,7 @@ static void sdhci_request(struct mmc_hos }else sdhci_send_command (host, mrq->cmd); +mmiowb ();spin_unlock_irqrestore (&host->lock, flags); }
@@ -753,6 +754,7 @@ static void sdhci_set_ios(struct mmc_hos ctrl &= ~SDHCI_CTRL_4BITBUS ;writeb (ctrl, host->ioaddr +SDHCI_HOST_CONTROL ); +mmiowb ();spin_unlock_irqrestore (&host->lock, flags); }
@@ -860,6 +862,7 @@ static void sdhci_tasklet_finish(unsignesdhci_deactivate_led (host); +mmiowb ();spin_unlock_irqrestore (&host->lock, flags);mmc_request_done (host->mmc, mrq);
@@ -893,6 +896,7 @@ static void sdhci_timeout_timer(unsigned } } +mmiowb ();spin_unlock_irqrestore (&host->lock, flags); }
@@ -1030,6 +1034,7 @@ static irqreturn_t sdhci_irq(int irq, vo result =IRQ_HANDLED ; +mmiowb (); out:spin_unlock (&host->lock);
@@ -1095,6 +1100,7 @@ static int sdhci_resume (struct pci_devif (chip->hosts[i]->flags &SDHCI_USE_DMA )pci_set_master (pdev);sdhci_init (chip->hosts[i]); +mmiowb (); ret =mmc_resume_host (chip->hosts[i]->mmc);if (ret)return ret;
@@ -1327,6 +1333,8 @@ #endif host->chip = chip; chip->hosts[slot] = host; +mmiowb (); +mmc_add_host (mmc); printk(KERN_INFO "%s: SDHCI at 0x%08lx irq %d %s\n", mmc_hostname(mmc),