diff mbox

omap_hsmmc: Flush posted write to IRQ

Message ID 49D9EF0F.9090808@nokia.com (mailing list archive)
State Awaiting Upstream, archived
Headers show

Commit Message

Adrian Hunter April 6, 2009, 12:01 p.m. UTC
From: Kevin Hilman <khilman@deeprootsystems.com>

Spurious IRQs seen on MMC after 2.6.29.  Flush posted write in IRQ
handler.

The interrupt line is released by clearing the error status bits
in the MMCHS_STAT register, which must occur before the interrupt
handler returns to avoid unwanted irqs.  Hence the need to flush
the posted write.

Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
---




This patch is slightly modified from Kevin's original, which is
here:

	http://marc.info/?l=linux-omap&m=123862814815052&w=2



 drivers/mmc/host/omap_hsmmc.c |    4 ++++
 1 files changed, 4 insertions(+), 0 deletions(-)

Comments

Tony Lindgren April 6, 2009, 4:49 p.m. UTC | #1
* Adrian Hunter <adrian.hunter@nokia.com> [090406 05:00]:
> From: Kevin Hilman <khilman@deeprootsystems.com>
>
> Spurious IRQs seen on MMC after 2.6.29.  Flush posted write in IRQ
> handler.
>
> The interrupt line is released by clearing the error status bits
> in the MMCHS_STAT register, which must occur before the interrupt
> handler returns to avoid unwanted irqs.  Hence the need to flush
> the posted write.
>
> Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>

Acked-by: Tony Lindgen <tony@atomide.com>

> ---
>
>
>
>
> This patch is slightly modified from Kevin's original, which is
> here:
>
> 	http://marc.info/?l=linux-omap&m=123862814815052&w=2
>
>
>
> drivers/mmc/host/omap_hsmmc.c |    4 ++++
> 1 files changed, 4 insertions(+), 0 deletions(-)
>
> diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
> index 04e5a0c..2ae6049 100644
> --- a/drivers/mmc/host/omap_hsmmc.c
> +++ b/drivers/mmc/host/omap_hsmmc.c
> @@ -452,6 +452,8 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
> 	if (host->mrq == NULL) {
> 		OMAP_HSMMC_WRITE(host->base, STAT,
> 			OMAP_HSMMC_READ(host->base, STAT));
> +		/* Flush posted write */
> +		OMAP_HSMMC_READ(host->base, STAT);
> 		return IRQ_HANDLED;
> 	}
>
> @@ -523,6 +525,8 @@ static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
> 	}
>
> 	OMAP_HSMMC_WRITE(host->base, STAT, status);
> +	/* Flush posted write */
> +	OMAP_HSMMC_READ(host->base, STAT);
>
> 	if (end_cmd || (status & CC))
> 		mmc_omap_cmd_done(host, host->cmd);
> -- 
> 1.5.6.3
--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Tony Lindgren April 7, 2009, 11:31 p.m. UTC | #2
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Initial commit ID (Likely to change): 346ac90bcf6d0e8a91b398237facd8d9fb2a7cde

PatchWorks
http://patchwork.kernel.org/patch/16515/

Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=346ac90bcf6d0e8a91b398237facd8d9fb2a7cde


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Pierre Ossman April 8, 2009, 6:36 p.m. UTC | #3
On Mon, 6 Apr 2009 09:49:18 -0700
Tony Lindgren <tony@atomide.com> wrote:

> * Adrian Hunter <adrian.hunter@nokia.com> [090406 05:00]:
> > From: Kevin Hilman <khilman@deeprootsystems.com>
> >
> > Spurious IRQs seen on MMC after 2.6.29.  Flush posted write in IRQ
> > handler.
> >
> > The interrupt line is released by clearing the error status bits
> > in the MMCHS_STAT register, which must occur before the interrupt
> > handler returns to avoid unwanted irqs.  Hence the need to flush
> > the posted write.
> >
> > Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>
> > Signed-off-by: Adrian Hunter <adrian.hunter@nokia.com>
> 
> Acked-by: Tony Lindgen <tony@atomide.com>
> 

Queued.
diff mbox

Patch

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 04e5a0c..2ae6049 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -452,6 +452,8 @@  static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 	if (host->mrq == NULL) {
 		OMAP_HSMMC_WRITE(host->base, STAT,
 			OMAP_HSMMC_READ(host->base, STAT));
+		/* Flush posted write */
+		OMAP_HSMMC_READ(host->base, STAT);
 		return IRQ_HANDLED;
 	}
 
@@ -523,6 +525,8 @@  static irqreturn_t mmc_omap_irq(int irq, void *dev_id)
 	}
 
 	OMAP_HSMMC_WRITE(host->base, STAT, status);
+	/* Flush posted write */
+	OMAP_HSMMC_READ(host->base, STAT);
 
 	if (end_cmd || (status & CC))
 		mmc_omap_cmd_done(host, host->cmd);