Skip to contentSkip to conversation

fsldma: dev_err 1 too early.

PATCH In review Roel Kluin 2 participants 2 messages Feb 25, 2009

Subsystems (2)
lore
Share & tools
lore

Roel Kluin

author
#0 lore raw

PATCH 1/1 fsldma: dev_err 1 too early.

If unsuccessful, i reaches 101 after the loop, so 100 is still success.

---

drivers/dma/fsldma.c +1 -1
index 70126a6..444c4e4 100644
@@ -168,7 +168,7 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan)
 
 	while (!dma_is_idle(fsl_chan) && (i++ < 100))
 		udelay(10);
-	if (i >= 100 && !dma_is_idle(fsl_chan))
+	if (i > 100 && !dma_is_idle(fsl_chan))
 		dev_err(fsl_chan->dev, "DMA halt timeout!\n");
 }
 
#1 lore raw
Quoted 9 lines · Roel Kluin

If unsuccessful, i reaches 101 after the loop, so 100 is still success.

---

drivers/dma/fsldma.c +0 -0
index 70126a6..444c4e4 100644

drivers/dma/fsldma.c static void dma_halt(struct fsl_dma_chan *fsl_chan) · line 174

Quoted 8 lines
drivers/dma/fsldma.c +1 -1
@@ -168,7 +168,7 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan)
 
 	while (!dma_is_idle(fsl_chan) && (i++ < 100))
 		udelay(10);
-	if (i >= 100 && !dma_is_idle(fsl_chan))
+	if (i > 100 && !dma_is_idle(fsl_chan))
 		dev_err(fsl_chan->dev, "DMA halt timeout!\n");
 }
 

Thanks for the report. I prefer a more canonical loop. Objections?

--
Dan

<-----
fsldma: fix off by one in dma_halt

From: Dan Williams <[email protected]>

Prevent dev_err from firing even if we successfully detected 'dma-idle' before the full 1ms timeout has elapsed.

---
 drivers/dma/fsldma.c |    8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)
drivers/dma/fsldma.c +6 -2
index 70126a6..86d6da4 100644
@@ -158,7 +158,8 @@ static void dma_start(struct fsl_dma_chan *fsl_chan)
 
 static void dma_halt(struct fsl_dma_chan *fsl_chan)
 {
-	int i = 0;
+	int i;
+
 	DMA_OUT(fsl_chan, &fsl_chan->reg_base->mr,
 		DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) | FSL_DMA_MR_CA,
 		32);
@@ -166,8 +167,11 @@ static void dma_halt(struct fsl_dma_chan *fsl_chan)
 		DMA_IN(fsl_chan, &fsl_chan->reg_base->mr, 32) & ~(FSL_DMA_MR_CS
 		| FSL_DMA_MR_EMS_EN | FSL_DMA_MR_CA), 32);
 
-	while (!dma_is_idle(fsl_chan) && (i++ < 100))
+	for (i = 0; i < 100; i++) {
+		if (dma_is_idle(fsl_chan))
+			break;
 		udelay(10);
+	}
 	if (i >= 100 && !dma_is_idle(fsl_chan))
 		dev_err(fsl_chan->dev, "DMA halt timeout!\n");
 }