[<prev] [next>] [<thread-prev] [thread-next>] [day] [month] [year] [list]
Message-Id: <20100918191304.198100717@clark.site>
Date: Sat, 18 Sep 2010 12:12:58 -0700
From: Greg KH <gregkh@...e.de>
To: linux-kernel@...r.kernel.org, stable@...nel.org
Cc: stable-review@...nel.org, torvalds@...ux-foundation.org,
akpm@...ux-foundation.org, alan@...rguk.ukuu.org.uk,
Yusuke Goda <yusuke.goda.sx@...esas.com>,
Magnus Damm <damm@...nsource.se>,
Ian Molton <ian@...menth.co.uk>,
Matt Fleming <matt@...sole-pimps.org>,
Samuel Ortiz <sameo@...ux.intel.com>,
Paul Mundt <lethal@...ux-sh.org>, <linux-mmc@...r.kernel.org>
Subject: [080/129] tmio_mmc: dont clear unhandled pending interrupts
2.6.35-stable review patch. If anyone has any objections, please let us know.
------------------
From: Yusuke Goda <yusuke.goda.sx@...esas.com>
commit b78d6c5f51935ba89df8db33a57bacb547aa7325 upstream.
Previously, it was possible for ack_mmc_irqs() to clear pending interrupt
bits in the CTL_STATUS register, even though the interrupt handler had not
been called. This was because of a race that existed when doing a
read-modify-write sequence on CTL_STATUS. After the read step in this
sequence, if an interrupt occurred (causing one of the bits in CTL_STATUS
to be set) the write step would inadvertently clear it.
Observed with the TMIO_STAT_RXRDY bit together with CMD53 on AR6002 and
BCM4318 SDIO cards in polled mode.
This patch eliminates this race by only writing to CTL_STATUS and clearing
the interrupts that were passed as an argument to ack_mmc_irqs()."
[matt@...sole-pimps.org: rewrote changelog]
Signed-off-by: Yusuke Goda <yusuke.goda.sx@...esas.com>
Acked-by: Magnus Damm <damm@...nsource.se>
Tested-by: Arnd Hannemann <arnd@...dnet.de>"
Acked-by: Ian Molton <ian@...menth.co.uk>
Cc: Matt Fleming <matt@...sole-pimps.org>
Cc: Samuel Ortiz <sameo@...ux.intel.com>
Cc: Paul Mundt <lethal@...ux-sh.org>
Cc: <linux-mmc@...r.kernel.org>
Signed-off-by: Andrew Morton <akpm@...ux-foundation.org>
Signed-off-by: Linus Torvalds <torvalds@...ux-foundation.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@...e.de>
---
drivers/mmc/host/tmio_mmc.h | 5 +----
1 file changed, 1 insertion(+), 4 deletions(-)
--- a/drivers/mmc/host/tmio_mmc.h
+++ b/drivers/mmc/host/tmio_mmc.h
@@ -82,10 +82,7 @@
#define ack_mmc_irqs(host, i) \
do { \
- u32 mask;\
- mask = sd_ctrl_read32((host), CTL_STATUS); \
- mask &= ~((i) & TMIO_MASK_IRQ); \
- sd_ctrl_write32((host), CTL_STATUS, mask); \
+ sd_ctrl_write32((host), CTL_STATUS, ~(i)); \
} while (0)
--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@...r.kernel.org
More majordomo info at http://vger.kernel.org/majordomo-info.html
Please read the FAQ at http://www.tux.org/lkml/
Powered by blists - more mailing lists