Skip to contentSkip to conversation

dma : EG20T PCH: Fix miss-setting DMA descriptor

PATCH In review Tomoya MORINAGA 3 participants 3 messages Dec 1, 2010 – Dec 6, 2010 dmaengine

lore
Share & tools
lore
#0 lore raw

PATCH 1/1 dma : EG20T PCH: Fix miss-setting DMA descriptor

From: Tomoya MORINAGA <[email protected]>

Currently, in case of using scatter/gather mode, head of data is not sent to

destination. The cause is second descriptor address is set to NEXT.

The NEXT must have head of descriptor address.

This patch sets head of descriptor address to the NEXT.

---
 drivers/dma/pch_dma.c |   15 ++++++++-------
 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/dma/pch_dma.c +8 -7
index 92b6790..a3d54c0 100644
@@ -259,11 +259,6 @@ static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)
 		return;
 	}
 
-	channel_writel(pd_chan, DEV_ADDR, desc->regs.dev_addr);
-	channel_writel(pd_chan, MEM_ADDR, desc->regs.mem_addr);
-	channel_writel(pd_chan, SIZE, desc->regs.size);
-	channel_writel(pd_chan, NEXT, desc->regs.next);
-
 	dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> dev_addr: %x\n",
 		pd_chan->chan.chan_id, desc->regs.dev_addr);
 	dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> mem_addr: %x\n",
@@ -273,10 +268,16 @@ static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)
 	dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> next: %x\n",
 		pd_chan->chan.chan_id, desc->regs.next);
 
-	if (list_empty(&desc->tx_list))
+	if (list_empty(&desc->tx_list)) {
+		channel_writel(pd_chan, DEV_ADDR, desc->regs.dev_addr);
+		channel_writel(pd_chan, MEM_ADDR, desc->regs.mem_addr);
+		channel_writel(pd_chan, SIZE, desc->regs.size);
+		channel_writel(pd_chan, NEXT, desc->regs.next);
 		pdc_set_mode(&pd_chan->chan, DMA_CTL0_ONESHOT);
-	else
+	} else {
+		channel_writel(pd_chan, NEXT, virt_to_phys(&desc->regs));
 		pdc_set_mode(&pd_chan->chan, DMA_CTL0_SG);
+	}
 
 	val = dma_readl(pd, CTL2);
 	val |= 1 << (DMA_CTL2_START_SHIFT_BITS + pd_chan->chan.chan_id);
Signature · 1 line
1.6.0.6
#1 lore raw

2010/12/1 Tomoya MORINAGA <[email protected]>:

Quoted 23 lines

From: Tomoya MORINAGA <[email protected]>

Currently, in case of using scatter/gather mode, head of data is not sent to

destination. The cause is second descriptor address is set to NEXT.

The NEXT must have head of descriptor address.

This patch sets head of descriptor address to the NEXT.

---
 drivers/dma/pch_dma.c |   15 ++++++++-------

 1 files changed, 8 insertions(+), 7 deletions(-)
drivers/dma/pch_dma.c +0 -0
index 92b6790..a3d54c0 100644

[..]

Quoted 4 lines
drivers/dma/pch_dma.c +0 -0
@@ -273,10 +268,16 @@ static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)
        dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> next: %x\n",
                pd_chan->chan.chan_id, desc->regs.next);
 

drivers/dma/pch_dma.c static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc) · line 278

Quoted 10 lines
drivers/dma/pch_dma.c +7 -2
-       if (list_empty(&desc->tx_list))
+       if (list_empty(&desc->tx_list)) {
+               channel_writel(pd_chan, DEV_ADDR, desc->regs.dev_addr);
+               channel_writel(pd_chan, MEM_ADDR, desc->regs.mem_addr);
+               channel_writel(pd_chan, SIZE, desc->regs.size);
+               channel_writel(pd_chan, NEXT, desc->regs.next);
                pdc_set_mode(&pd_chan->chan, DMA_CTL0_ONESHOT);
-       else
+       } else {
+               channel_writel(pd_chan, NEXT, virt_to_phys(&desc->regs));

There is a reason for the following comment for virt_to_phys():

/*      This function does not give bus mappings for DMA transfers. In
 *      almost all conceivable cases a device driver should not be using
 *      this function

*/

...in this case this wants to be:

     channel_write(pd_chan, NEXT, desc->txd.phys);

I'll let Yong comment on the correctness of the rest.

--
Dan

Acked-by Yong Wang
#2 lore raw
Quoted 30 lines
Quoted 4 lines
drivers/dma/pch_dma.c +0 -0
index 92b6790..a3d54c0 100644

[..]

drivers/dma/pch_dma.c static void pdc_dostart(struct pch_dma_chan

Quoted 1 line
drivers/dma/pch_dma.c +0 -0
@@ -273,10 +268,16 @@ static void pdc_dostart(struct pch_dma_chan

*pd_chan, struct pch_dma_desc* desc)

drivers/dma/pch_dma.c static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)

Quoted 6 lines
drivers/dma/pch_dma.c +2 -1
        dev_dbg(chan2dev(&pd_chan->chan), "chan %d -> next: %x\n",
                pd_chan->chan.chan_id, desc->regs.next);
 
-       if (list_empty(&desc->tx_list))
+       if (list_empty(&desc->tx_list)) {
+               channel_writel(pd_chan, DEV_ADDR,

desc->regs.dev_addr);

drivers/dma/pch_dma.c static void pdc_dostart(struct pch_dma_chan · line 273

Quoted 1 line
drivers/dma/pch_dma.c +1 -0
+               channel_writel(pd_chan, MEM_ADDR,

desc->regs.mem_addr);

drivers/dma/pch_dma.c static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)

Quoted 3 lines
drivers/dma/pch_dma.c +2 -0
+               channel_writel(pd_chan, SIZE, desc->regs.size);
+               channel_writel(pd_chan, NEXT, desc->regs.next);
                pdc_set_mode(&pd_chan->chan,

DMA_CTL0_ONESHOT);

drivers/dma/pch_dma.c static void pdc_dostart(struct pch_dma_chan *pd_chan, struct pch_dma_desc* desc)

Quoted 3 lines
drivers/dma/pch_dma.c +2 -1
-       else
+       } else {
+               channel_writel(pd_chan, NEXT,

virt_to_phys(&desc->regs));

There is a reason for the following comment for virt_to_phys():

/*      This function does not give bus mappings for DMA transfers. In
 *      almost all conceivable cases a device driver should not be using
 *      this function
Quoted 8 lines

*/

...in this case this wants to be:

     channel_write(pd_chan, NEXT, desc->txd.phys);

I'll let Yong comment on the correctness of the rest.

Hi Dan,

Apart from the issue you pointed out, the patch looks good to me. If it is convenient for you, please help make the change and merge this patch. Otherwise, please let Tomoya know that you want him to send an updated patch. Thanks!

-Yong