Skip to contentSkip to conversation

S3C64XX DMA: TC-IRQ implemented.

PATCH New Jassi 4 participants 5 messages Sep 15, 2009 – Sep 16, 2009

Subsystems (3)
lore
Share & tools
lore

Jassi

author
#0 lore raw

PATCH 5/7 S3C64XX DMA: TC-IRQ implemented.

The available irq handler simply doesn't work. The Dma state-machine is broken. This patch fixes it.
Also, chan->curr,next,end pointer manipulation is protected.

---
 arch/arm/plat-s3c64xx/dma.c |   61 +++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 22 deletions(-)
arch/arm/plat-s3c64xx/dma.c +39 -22
index 02bc82b..e68469d 100644
@@ -339,6 +339,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 	struct s3c64xx_dma_buff *next;
 	struct s3c64xx_dma_buff *buff;
 	struct pl080s_lli *lli;
+	unsigned long flags;
 	int ret;
 
 	WARN_ON(!chan);
@@ -366,6 +367,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 
 	s3c64xx_dma_fill_lli(chan, lli, data, size);
 
+	local_irq_save(flags);
+
 	if ((next = chan->next) != NULL) {
 		struct s3c64xx_dma_buff *end = chan->end;
 		struct pl080s_lli *endlli = end->lli;
@@ -399,6 +402,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 		s3c64xx_lli_to_regs(chan, lli);
 	}
 
+	local_irq_restore(flags);
+
 	show_lli(lli);
 
 	dbg_showchan(chan);
@@ -562,27 +567,13 @@ int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)
 
 EXPORT_SYMBOL(s3c2410_dma_free);
 
-
-static void s3c64xx_dma_tcirq(struct s3c64xx_dmac *dmac, int offs)
-{
-	struct s3c2410_dma_chan *chan = dmac->channels + offs;
-
-	/* note, we currently do not bother to work out which buffer
-	 * or buffers have been completed since the last tc-irq. */
-
-	if (chan->callback_fn)
-		(chan->callback_fn)(chan, chan->curr->pw, 0, S3C2410_RES_OK);
-}
-
-static void s3c64xx_dma_errirq(struct s3c64xx_dmac *dmac, int offs)
-{
-	printk(KERN_DEBUG "%s: offs %d\n", __func__, offs);
-}
-
 static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
 {
+	struct s3c64xx_dma_buff *buff;
 	struct s3c64xx_dmac *dmac = pw;
-	u32 tcstat, errstat;
+	struct s3c2410_dma_chan *chan;
+	enum s3c2410_dma_buffresult res;
+	u32 tcstat, errstat, val;
 	u32 bit;
 	int offs;
 
@@ -590,15 +581,41 @@ static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
 	errstat = readl(dmac->regs + PL080_ERR_STATUS);
 
 	for (offs = 0, bit = 1; offs < 8; offs++, bit <<= 1) {
+
+		if (!(errstat & bit) && !(tcstat & bit))
+			continue;
+
+		res = S3C2410_RES_ERR;
+
+		if (errstat & bit)
+			writel(bit, dmac->regs + PL080_ERR_CLEAR);
+
 		if (tcstat & bit) {
 			writel(bit, dmac->regs + PL080_TC_CLEAR);
-			s3c64xx_dma_tcirq(dmac, offs);
+			res = S3C2410_RES_OK;
 		}
 
-		if (errstat & bit) {
-			s3c64xx_dma_errirq(dmac, offs);
-			writel(bit, dmac->regs + PL080_ERR_CLEAR);
+		chan = dmac->channels + offs;
+		if(chan->curr == NULL)
+			continue;
+
+		buff = chan->curr;
+		if (chan->curr != chan->end) {
+			BUG_ON(chan->curr->next == NULL);
+			chan->curr = chan->curr->next;
+
+			val = readl(chan->regs + PL080S_CH_CONFIG);
+			if (!(val & PL080_CONFIG_ACTIVE)) {
+				s3c64xx_lli_to_regs(chan, chan->curr->lli);
+				val |= PL080_CONFIG_ENABLE;
+				writel(val, chan->regs + PL080S_CH_CONFIG);
+			}
+		} else {
+			chan->curr = chan->next = chan->end = NULL;
 		}
+
+		s3c64xx_dma_bufffdone(chan, buff, res);
+		s3c64xx_dma_freebuff(buff);
 	}
 
 	return IRQ_HANDLED;
Signature · 1 line
1.6.2.5
#1 lore raw

PATCH 5/7 S3C64XX DMA: TC-IRQ implemented.

arch/arm/plat-s3c64xx/dma.c static irqreturn_t s3c64xx_dma_irq(int irq, void *pw) · line 591

Quoted 2 lines · Jassi
arch/arm/plat-s3c64xx/dma.c +2 -0
+		if (errstat & bit)
+			writel(bit, dmac->regs + PL080_ERR_CLEAR);

The old code would complain in the logs on error, which seems like a reasonable approach if we've no better idea what to do - it at least tells people something about what might be going on if things break.

arch/arm/plat-s3c64xx/dma.c static irqreturn_t s3c64xx_dma_irq(int irq, void *pw) · line 600

Quoted 3 lines
arch/arm/plat-s3c64xx/dma.c +3 -0
+		chan = dmac->channels + offs;
+		if(chan->curr == NULL)
+			continue;

It's probably a good idea to run your patches through scripts/checkpatch.pl before submitting them.

#2 lore raw

PATCH 5/7 S3C64XX DMA: TC-IRQ implemented.

Quoted 8 lines · Mark Brown
Quoted 2 lines · Jassi

+ ? ? ? ? ? ? if (errstat & bit)
+ ? ? ? ? ? ? ? ? ? ? writel(bit, dmac->regs + PL080_ERR_CLEAR);

The old code would complain in the logs on error, which seems like a reasonable approach if we've no better idea what to do - it at least tells people something about what might be going on if things break.

Yes, some debug mssg wud be better.

Quoted 6 lines
Quoted 3 lines

+ ? ? ? ? ? ? chan = dmac->channels + offs;
+ ? ? ? ? ? ? if(chan->curr == NULL)
+ ? ? ? ? ? ? ? ? ? ? continue;

It's probably a good idea to run your patches through scripts/checkpatch.pl before submitting them.

ahhhh.... my me!!

#3 lore raw

PATCH 5/7 S3C64XX DMA: TC-IRQ implemented.

In reply to Jassi
Quoted 2 lines · Jassi

The available irq handler simply doesn't work. The Dma state-machine is broken. This patch fixes it.

A better explanation would have been nice, so I could actually evaluate what is going on here.

Quoted 1 line

Also, chan->curr,next,end pointer manipulation is protected.

Should have been a seperate patch, I would have been able to apply that reasonably easily.

Quoted 40 lines
---
 arch/arm/plat-s3c64xx/dma.c |   61 +++++++++++++++++++++++++++---------------
 1 files changed, 39 insertions(+), 22 deletions(-)
arch/arm/plat-s3c64xx/dma.c +5 -1
index 02bc82b..e68469d 100644
@@ -339,6 +339,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 	struct s3c64xx_dma_buff *next;
 	struct s3c64xx_dma_buff *buff;
 	struct pl080s_lli *lli;
+	unsigned long flags;
 	int ret;
 
 	WARN_ON(!chan);
@@ -366,6 +367,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 
 	s3c64xx_dma_fill_lli(chan, lli, data, size);
 
+	local_irq_save(flags);
+
 	if ((next = chan->next) != NULL) {
 		struct s3c64xx_dma_buff *end = chan->end;
 		struct pl080s_lli *endlli = end->lli;
@@ -399,6 +402,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 		s3c64xx_lli_to_regs(chan, lli);
 	}
 
+	local_irq_restore(flags);
+
 	show_lli(lli);
 
 	dbg_showchan(chan);
@@ -562,27 +567,13 @@ int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)
 
 EXPORT_SYMBOL(s3c2410_dma_free);
 
-

arch/arm/plat-s3c64xx/dma.c int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client) · line 575

Quoted 10 lines
arch/arm/plat-s3c64xx/dma.c +0 -10
-static void s3c64xx_dma_tcirq(struct s3c64xx_dmac *dmac, int offs)
-{
-	struct s3c2410_dma_chan *chan = dmac->channels + offs;
-
-	/* note, we currently do not bother to work out which buffer
-	 * or buffers have been completed since the last tc-irq. */
-
-	if (chan->callback_fn)
-		(chan->callback_fn)(chan, chan->curr->pw, 0, S3C2410_RES_OK);
-}

I belive a callback is necessary for the audio code to update the current dma position of the stream. I also thought this worked?

Quoted 50 lines
arch/arm/plat-s3c64xx/dma.c +26 -10
-static void s3c64xx_dma_errirq(struct s3c64xx_dmac *dmac, int offs)
-{
-	printk(KERN_DEBUG "%s: offs %d\n", __func__, offs);
-}
-
 static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
 {
+	struct s3c64xx_dma_buff *buff;
 	struct s3c64xx_dmac *dmac = pw;
-	u32 tcstat, errstat;
+	struct s3c2410_dma_chan *chan;
+	enum s3c2410_dma_buffresult res;
+	u32 tcstat, errstat, val;
 	u32 bit;
 	int offs;
 
@@ -590,15 +581,41 @@ static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
 	errstat = readl(dmac->regs + PL080_ERR_STATUS);
 
 	for (offs = 0, bit = 1; offs < 8; offs++, bit <<= 1) {
+
+		if (!(errstat & bit) && !(tcstat & bit))
+			continue;
+
+		res = S3C2410_RES_ERR;
+
+		if (errstat & bit)
+			writel(bit, dmac->regs + PL080_ERR_CLEAR);
+
 		if (tcstat & bit) {
 			writel(bit, dmac->regs + PL080_TC_CLEAR);
-			s3c64xx_dma_tcirq(dmac, offs);
+			res = S3C2410_RES_OK;
 		}
 
-		if (errstat & bit) {
-			s3c64xx_dma_errirq(dmac, offs);
-			writel(bit, dmac->regs + PL080_ERR_CLEAR);
+		chan = dmac->channels + offs;
+		if(chan->curr == NULL)
+			continue;
+
+		buff = chan->curr;
+		if (chan->curr != chan->end) {
+			BUG_ON(chan->curr->next == NULL);
+			chan->curr = chan->curr->next;
+
+			val = readl(chan->regs + PL080S_CH_CONFIG);
+			if (!(val & PL080_CONFIG_ACTIVE)) {
+				s3c64xx_lli_to_regs(chan, chan->curr->lli);

arch/arm/plat-s3c64xx/dma.c static irqreturn_t s3c64xx_dma_irq(int irq, void *pw) · line 619

Quoted 10 lines
arch/arm/plat-s3c64xx/dma.c +8 -0
+				val |= PL080_CONFIG_ENABLE;
+				writel(val, chan->regs + PL080S_CH_CONFIG);
+			}
+		} else {
+			chan->curr = chan->next = chan->end = NULL;
 		}
+
+		s3c64xx_dma_bufffdone(chan, buff, res);
+		s3c64xx_dma_freebuff(buff);
 	}

Hmm, this looks like a train wreck. Please do not move code around like this.

Signature · 4 lines
Ben

Q:      What's a light-year?
A:      One-third less calories than a regular year.
#4 lore raw

PATCH 5/7 S3C64XX DMA: TC-IRQ implemented.

Quoted 5 lines · Ben Dooks
Quoted 1 line · Jassi

Also, chan->curr,next,end pointer manipulation is protected.

Should have been a seperate patch, I would have been able to apply that reasonably easily.

Ok, will resend as a separate patch.

Quoted 39 lines
Quoted 39 lines

---
?arch/arm/plat-s3c64xx/dma.c | ? 61 +++++++++++++++++++++++++++--------------- ?1 files changed, 39 insertions(+), 22 deletions(-)

arch/arm/plat-s3c64xx/dma.c +5 -0
index 02bc82b..e68469d 100644
@@ -339,6 +339,7 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 ? ? ? struct s3c64xx_dma_buff *next;
 ? ? ? struct s3c64xx_dma_buff *buff;
 ? ? ? struct pl080s_lli *lli;
+ ? ? unsigned long flags;
 ? ? ? int ret;
 
 ? ? ? WARN_ON(!chan);
@@ -366,6 +367,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 
 ? ? ? s3c64xx_dma_fill_lli(chan, lli, data, size);
 
+ ? ? local_irq_save(flags);
+
 ? ? ? if ((next = chan->next) != NULL) {
 ? ? ? ? ? ? ? struct s3c64xx_dma_buff *end = chan->end;
 ? ? ? ? ? ? ? struct pl080s_lli *endlli = end->lli;
@@ -399,6 +402,8 @@ int s3c2410_dma_enqueue(unsigned int channel, void *id,
 ? ? ? ? ? ? ? s3c64xx_lli_to_regs(chan, lli);
 ? ? ? }
 
+ ? ? local_irq_restore(flags);
+
 ? ? ? show_lli(lli);
 
 ? ? ? dbg_showchan(chan);
@@ -562,27 +567,13 @@ int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client)
 
 ?EXPORT_SYMBOL(s3c2410_dma_free);
 
Quoted 14 lines

arch/arm/plat-s3c64xx/dma.c int s3c2410_dma_free(unsigned int channel, struct s3c2410_dma_client *client) · line 575

Quoted 11 lines
arch/arm/plat-s3c64xx/dma.c +0 -11
-
-static void s3c64xx_dma_tcirq(struct s3c64xx_dmac *dmac, int offs)
-{
- ? ? struct s3c2410_dma_chan *chan = dmac->channels + offs;
-
- ? ? /* note, we currently do not bother to work out which buffer
- ? ? ?* or buffers have been completed since the last tc-irq. */
-
- ? ? if (chan->callback_fn)
- ? ? ? ? ? ? (chan->callback_fn)(chan, chan->curr->pw, 0, S3C2410_RES_OK);
-}

I belive a callback is necessary for the audio code to update the current dma position of the stream. I also thought this worked?

Of course, it is necessary. And my patch doesn't skip that. Instead of special wrapper for callback during TC-IRQ, I make use of the existing function s3c64xx_dma_buffdone with return code as per the IRQ status.
Also, with the patch, callback_fn is called for each buffer that was enqueued.

Quoted 55 lines
Quoted 55 lines
arch/arm/plat-s3c64xx/dma.c +31 -10
-static void s3c64xx_dma_errirq(struct s3c64xx_dmac *dmac, int offs)
-{
- ? ? printk(KERN_DEBUG "%s: offs %d\n", __func__, offs);
-}
-
 ?static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
 ?{
+ ? ? struct s3c64xx_dma_buff *buff;
 ? ? ? struct s3c64xx_dmac *dmac = pw;
- ? ? u32 tcstat, errstat;
+ ? ? struct s3c2410_dma_chan *chan;
+ ? ? enum s3c2410_dma_buffresult res;
+ ? ? u32 tcstat, errstat, val;
 ? ? ? u32 bit;
 ? ? ? int offs;
 
@@ -590,15 +581,41 @@ static irqreturn_t s3c64xx_dma_irq(int irq, void *pw)
 ? ? ? errstat = readl(dmac->regs + PL080_ERR_STATUS);
 
 ? ? ? for (offs = 0, bit = 1; offs < 8; offs++, bit <<= 1) {
+
+ ? ? ? ? ? ? if (!(errstat & bit) && !(tcstat & bit))
+ ? ? ? ? ? ? ? ? ? ? continue;
+
+ ? ? ? ? ? ? res = S3C2410_RES_ERR;
+
+ ? ? ? ? ? ? if (errstat & bit)
+ ? ? ? ? ? ? ? ? ? ? writel(bit, dmac->regs + PL080_ERR_CLEAR);
+
 ? ? ? ? ? ? ? if (tcstat & bit) {
 ? ? ? ? ? ? ? ? ? ? ? writel(bit, dmac->regs + PL080_TC_CLEAR);
- ? ? ? ? ? ? ? ? ? ? s3c64xx_dma_tcirq(dmac, offs);
+ ? ? ? ? ? ? ? ? ? ? res = S3C2410_RES_OK;
 ? ? ? ? ? ? ? }
 
- ? ? ? ? ? ? if (errstat & bit) {
- ? ? ? ? ? ? ? ? ? ? s3c64xx_dma_errirq(dmac, offs);
- ? ? ? ? ? ? ? ? ? ? writel(bit, dmac->regs + PL080_ERR_CLEAR);
+ ? ? ? ? ? ? chan = dmac->channels + offs;
+ ? ? ? ? ? ? if(chan->curr == NULL)
+ ? ? ? ? ? ? ? ? ? ? continue;
+
+ ? ? ? ? ? ? buff = chan->curr;
+ ? ? ? ? ? ? if (chan->curr != chan->end) {
+ ? ? ? ? ? ? ? ? ? ? BUG_ON(chan->curr->next == NULL);
+ ? ? ? ? ? ? ? ? ? ? chan->curr = chan->curr->next;
+
+ ? ? ? ? ? ? ? ? ? ? val = readl(chan->regs + PL080S_CH_CONFIG);
+ ? ? ? ? ? ? ? ? ? ? if (!(val & PL080_CONFIG_ACTIVE)) {
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? s3c64xx_lli_to_regs(chan, chan->curr->lli);
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? val |= PL080_CONFIG_ENABLE;
+ ? ? ? ? ? ? ? ? ? ? ? ? ? ? writel(val, chan->regs + PL080S_CH_CONFIG);
+ ? ? ? ? ? ? ? ? ? ? }
+ ? ? ? ? ? ? } else {
+ ? ? ? ? ? ? ? ? ? ? chan->curr = chan->next = chan->end = NULL;
Quoted 8 lines

arch/arm/plat-s3c64xx/dma.c static irqreturn_t s3c64xx_dma_irq(int irq, void *pw) · line 619

Quoted 5 lines
arch/arm/plat-s3c64xx/dma.c +3 -0
 ? ? ? ? ? ? ? }
+
+ ? ? ? ? ? ? s3c64xx_dma_bufffdone(chan, buff, res);
+ ? ? ? ? ? ? s3c64xx_dma_freebuff(buff);
 ? ? ? }

Hmm, this looks like a train wreck. Please do not move code around like this.

Please have a parallel look at the driver with and without the patch to see the overall picture.
I know the reviewer shudn't need to do that, but its code modified more than moved.