Skip to contentSkip to conversation

mmc: mmci: Fixup handling of MCI_STARTBITERR

PATCH New Ulf Hansson 3 participants 3 messages Nov 10, 2011 – Dec 13, 2011

Subsystems (2)
MMC, SD and SDIO Arm primecell mmci PL180/1 driver
lore
Share & tools
lore

Ulf Hansson

author
#0 lore raw

PATCH 1/1 mmc: mmci: Fixup handling of MCI_STARTBITERR

The interrupt was previously enabled and then correctly cleared. Now we also handle it correctly.

Signed-off-by Ulf Hansson <[email protected]>
---
 drivers/mmc/host/mmci.c |    8 +++++---
 1 files changed, 5 insertions(+), 3 deletions(-)
drivers/mmc/host/mmci.c +5 -3
index 50b5f99..8265981 100644
@@ -675,7 +675,8 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
 	      unsigned int status)
 {
 	/* First check for errors */
-	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
+	if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
+		      MCI_TXUNDERRUN|MCI_RXOVERRUN)) {
 		u32 remain, success;
 
 		/* Terminate the DMA transfer */

@@ -955,8 +956,9 @@ static irqreturn_t mmci_irq(int irq, void *dev_id)
 		dev_dbg(mmc_dev(host->mmc), "irq0 (data+cmd) %08x\n", status);
 
 		data = host->data;
-		if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_TXUNDERRUN|
-			      MCI_RXOVERRUN|MCI_DATAEND|MCI_DATABLOCKEND) && data)
+		if (status & (MCI_DATACRCFAIL|MCI_DATATIMEOUT|MCI_STARTBITERR|
+			      MCI_TXUNDERRUN|MCI_RXOVERRUN|MCI_DATAEND|
+			      MCI_DATABLOCKEND) && data)
 			mmci_data_irq(host, data, status);
 
 		cmd = host->cmd;
Signature · 1 line
1.7.5.4
#2 lore raw

PATCH 1/1 mmc: mmci: Fixup handling of MCI_STARTBITERR

Hi,

Quoted 8 lines · Linus Walleij
Quoted 4 lines

The interrupt was previously enabled and then correctly cleared. Now we also handle it correctly.

Signed-off-by Ulf Hansson <[email protected]>
Acked-by Linus Walleij <[email protected]>

This should also go to -stable I think?

Just to check: should I be leaving MMCI patches for Russell to take care of? I don't have hardware, so this suits me fine, but MAINTAINERS currently lists it as Orphan.

Thanks,

- Chris.

Signature · 2 lines
Chris Ball   <[email protected]>   <http://printf.net/>
One Laptop Per Child