* [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
@ 2009-09-16 6:21 jie.yang
2009-09-16 6:57 ` David Miller
2009-09-16 9:10 ` Daniel Walker
0 siblings, 2 replies; 11+ messages in thread
From: jie.yang @ 2009-09-16 6:21 UTC (permalink / raw)
To: davem; +Cc: miles.lane, chris.snook, jcliburn, netdev, linux-kernel, Jie Yang
[ 25.059969] WARNING: at lib/dma-debug.c:816 check_unmap+0x383/0x55c()
[ 25.059976] Hardware name: 1000HE
[ 25.059984] ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
memory with wrong function [device address=0x0000000036b92802]
[size=90 bytes] [mapped as single] [unmapped as page]
use the wrong API when free dma. So when map dma use a flag to demostrate
whether it is 'pci_map_single' or 'pci_map_page'. When free the dma, check
the flags to select the right APIs('pci_unmap_single' or 'pci_unmap_page').
Signed-off-by: Jie Yang <jie.yang@atheros.com>
---
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/atl1e/atl1e.h
index ba48220..d63be5c 100644
--- a/drivers/net/atl1e/atl1e.h
+++ b/drivers/net/atl1e/atl1e.h
@@ -377,10 +377,19 @@ struct atl1e_hw {
*/
struct atl1e_tx_buffer {
struct sk_buff *skb;
+ unsigned long flags;
+#define ATL1E_TX_PCIMAP_SINGLE 0x0001
+#define ATL1E_TX_PCIMAP_PAGE 0x0002
+#define ATL1E_TX_PCIMAP_TYPE_MASK 0x3
u16 length;
dma_addr_t dma;
};
+#define ATL1E_SET_PCIMAP_TYPE(tx_buff, type) do { \
+ ((tx_buff)->flags) &= ~ATL1E_TX_PCIMAP_TYPE_MASK; \
+ ((tx_buff)->flags) |= (type); \
+ } while (0)
+
struct atl1e_rx_page {
dma_addr_t dma; /* receive rage DMA address */
u8 *addr; /* receive rage virtual address */
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 69b830f..955da73 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -635,7 +635,11 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
for (index = 0; index < ring_count; index++) {
tx_buffer = &tx_ring->tx_buffer[index];
if (tx_buffer->dma) {
- pci_unmap_page(pdev, tx_buffer->dma,
+ if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
+ pci_unmap_single(pdev, tx_buffer->dma,
+ tx_buffer->length, PCI_DMA_TODEVICE);
+ else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
+ pci_unmap_page(pdev, tx_buffer->dma,
tx_buffer->length, PCI_DMA_TODEVICE);
tx_buffer->dma = 0;
}
@@ -1220,7 +1224,11 @@ static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)
while (next_to_clean != hw_next_to_clean) {
tx_buffer = &tx_ring->tx_buffer[next_to_clean];
if (tx_buffer->dma) {
- pci_unmap_page(adapter->pdev, tx_buffer->dma,
+ if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
+ pci_unmap_single(adapter->pdev, tx_buffer->dma,
+ tx_buffer->length, PCI_DMA_TODEVICE);
+ else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
+ pci_unmap_page(adapter->pdev, tx_buffer->dma,
tx_buffer->length, PCI_DMA_TODEVICE);
tx_buffer->dma = 0;
}
@@ -1741,6 +1749,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
tx_buffer->length = map_len;
tx_buffer->dma = pci_map_single(adapter->pdev,
skb->data, hdr_len, PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_SINGLE);
mapped_len += map_len;
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1766,6 +1775,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
tx_buffer->dma =
pci_map_single(adapter->pdev, skb->data + mapped_len,
map_len, PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_SINGLE);
mapped_len += map_len;
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1801,6 +1811,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
(i * MAX_TX_BUF_LEN),
tx_buffer->length,
PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE);
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
((cpu_to_le32(tx_buffer->length) &
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 6:21 [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA jie.yang
@ 2009-09-16 6:57 ` David Miller
2009-09-16 9:10 ` Daniel Walker
1 sibling, 0 replies; 11+ messages in thread
From: David Miller @ 2009-09-16 6:57 UTC (permalink / raw)
To: jie.yang; +Cc: miles.lane, chris.snook, jcliburn, netdev, linux-kernel
From: <jie.yang@atheros.com>
Date: Wed, 16 Sep 2009 14:21:53 +0800
>
> [ 25.059969] WARNING: at lib/dma-debug.c:816 check_unmap+0x383/0x55c()
> [ 25.059976] Hardware name: 1000HE
> [ 25.059984] ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
> memory with wrong function [device address=0x0000000036b92802]
> [size=90 bytes] [mapped as single] [unmapped as page]
>
> use the wrong API when free dma. So when map dma use a flag to demostrate
> whether it is 'pci_map_single' or 'pci_map_page'. When free the dma, check
> the flags to select the right APIs('pci_unmap_single' or 'pci_unmap_page').
>
> Signed-off-by: Jie Yang <jie.yang@atheros.com>
An 'unsigned long' is an enormous type to use just to store
3 bits of information. Use a u16 or similar to compact the
size of struct atl1e_tx_buffer
Also, it looks terribly ugle to define the flag macros, some with
three leading zeros in the hexadecimal values and one without.
Please make them consistent, thanks.
Generally, I see that this change was put together very hastily
and without very much care.
^ permalink raw reply [flat|nested] 11+ messages in thread* Re: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 6:21 [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA jie.yang
2009-09-16 6:57 ` David Miller
@ 2009-09-16 9:10 ` Daniel Walker
2009-09-16 9:31 ` Jie Yang
2009-09-16 9:47 ` David Miller
1 sibling, 2 replies; 11+ messages in thread
From: Daniel Walker @ 2009-09-16 9:10 UTC (permalink / raw)
To: jie.yang; +Cc: davem, miles.lane, chris.snook, jcliburn, netdev, linux-kernel
On Wed, 2009-09-16 at 14:21 +0800, jie.yang@atheros.com wrote:
> - pci_unmap_page(pdev, tx_buffer->dma,
> + if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
> + pci_unmap_single(pdev, tx_buffer->dma,
> + tx_buffer->length, PCI_DMA_TODEVICE);
> + else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
> + pci_unmap_page(pdev, tx_buffer->dma,
Could you run this through checkpatch, and fix any errors if find? It
looks like you uses spaces for tabs in the code above, maybe in the
other block too..
Daniel
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 9:10 ` Daniel Walker
@ 2009-09-16 9:31 ` Jie Yang
2009-09-16 9:47 ` David Miller
1 sibling, 0 replies; 11+ messages in thread
From: Jie Yang @ 2009-09-16 9:31 UTC (permalink / raw)
To: Daniel Walker
Cc: davem@davemloft.net, miles.lane@gmail.com, chris.snook@gmail.com,
jcliburn@gmail.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
On Wednesday, September 16, 2009 5:11 PM
Daniel Walker <dwalker@fifo99.com> wrote:
> On Wed, 2009-09-16 at 14:21 +0800, jie.yang@atheros.com wrote:
> > - pci_unmap_page(pdev, tx_buffer->dma,
> > + if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
> > + pci_unmap_single(pdev, tx_buffer->dma,
> > + tx_buffer->length, PCI_DMA_TODEVICE);
> > + else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
> > + pci_unmap_page(pdev, tx_buffer->dma,
>
> Could you run this through checkpatch, and fix any errors if
> find? It looks like you uses spaces for tabs in the code
> above, maybe in the other block too..
>
> Daniel
>
>
ou, my mistake, just resend.
Best wishes
jie
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 9:10 ` Daniel Walker
2009-09-16 9:31 ` Jie Yang
@ 2009-09-16 9:47 ` David Miller
2009-09-16 9:51 ` Cyrill Gorcunov
1 sibling, 1 reply; 11+ messages in thread
From: David Miller @ 2009-09-16 9:47 UTC (permalink / raw)
To: dwalker; +Cc: jie.yang, miles.lane, chris.snook, jcliburn, netdev, linux-kernel
From: Daniel Walker <dwalker@fifo99.com>
Date: Wed, 16 Sep 2009 02:10:51 -0700
> On Wed, 2009-09-16 at 14:21 +0800, jie.yang@atheros.com wrote:
>> - pci_unmap_page(pdev, tx_buffer->dma,
>> + if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
>> + pci_unmap_single(pdev, tx_buffer->dma,
>> + tx_buffer->length, PCI_DMA_TODEVICE);
>> + else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
>> + pci_unmap_page(pdev, tx_buffer->dma,
>
> Could you run this through checkpatch, and fix any errors if find? It
> looks like you uses spaces for tabs in the code above, maybe in the
> other block too..
>
It's because of his email client, it corrupted the whole patch
like that.
^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 9:47 ` David Miller
@ 2009-09-16 9:51 ` Cyrill Gorcunov
2009-09-16 9:54 ` Jie Yang
0 siblings, 1 reply; 11+ messages in thread
From: Cyrill Gorcunov @ 2009-09-16 9:51 UTC (permalink / raw)
To: David Miller
Cc: dwalker, jie.yang, miles.lane, chris.snook, jcliburn, netdev,
linux-kernel
[David Miller - Wed, Sep 16, 2009 at 02:47:59AM -0700]
| From: Daniel Walker <dwalker@fifo99.com>
| Date: Wed, 16 Sep 2009 02:10:51 -0700
|
| > On Wed, 2009-09-16 at 14:21 +0800, jie.yang@atheros.com wrote:
| >> - pci_unmap_page(pdev, tx_buffer->dma,
| >> + if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
| >> + pci_unmap_single(pdev, tx_buffer->dma,
| >> + tx_buffer->length, PCI_DMA_TODEVICE);
| >> + else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
| >> + pci_unmap_page(pdev, tx_buffer->dma,
| >
| > Could you run this through checkpatch, and fix any errors if find? It
| > looks like you uses spaces for tabs in the code above, maybe in the
| > other block too..
| >
|
| It's because of his email client, it corrupted the whole patch
| like that.
well, client seems to be
| X-Mailer: git-send-email 1.5.2.2
more probably the text editor is the reason.
-- Cyrill
^ permalink raw reply [flat|nested] 11+ messages in thread
* RE: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 9:51 ` Cyrill Gorcunov
@ 2009-09-16 9:54 ` Jie Yang
0 siblings, 0 replies; 11+ messages in thread
From: Jie Yang @ 2009-09-16 9:54 UTC (permalink / raw)
To: Cyrill Gorcunov, David Miller
Cc: dwalker@fifo99.com, miles.lane@gmail.com, chris.snook@gmail.com,
jcliburn@gmail.com, netdev@vger.kernel.org,
linux-kernel@vger.kernel.org
On Wednesday, September 16, 2009 5:52 PM
Cyrill Gorcunov <gorcunov@gmail.com> wrote:
> [David Miller - Wed, Sep 16, 2009 at 02:47:59AM -0700]
> | From: Daniel Walker <dwalker@fifo99.com>
> | Date: Wed, 16 Sep 2009 02:10:51 -0700
> |
> | > On Wed, 2009-09-16 at 14:21 +0800, jie.yang@atheros.com wrote:
> | >> - pci_unmap_page(pdev, tx_buffer->dma,
> | >> + if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
> | >> + pci_unmap_single(pdev, tx_buffer->dma,
> | >> + tx_buffer->length, PCI_DMA_TODEVICE);
> | >> + else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
> | >> + pci_unmap_page(pdev, tx_buffer->dma,
> | >
> | > Could you run this through checkpatch, and fix any errors
> if find?
> | > It looks like you uses spaces for tabs in the code above,
> maybe in
> | > the other block too..
> | >
> |
> | It's because of his email client, it corrupted the whole patch like
> | that.
>
> well, client seems to be
>
> | X-Mailer: git-send-email 1.5.2.2
>
> more probably the text editor is the reason.
>
> -- Cyrill
>
yes, the editor 'vi' have configed "set expandtab".
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
@ 2009-09-16 7:23 jie.yang
2009-09-16 7:44 ` David Miller
0 siblings, 1 reply; 11+ messages in thread
From: jie.yang @ 2009-09-16 7:23 UTC (permalink / raw)
To: davem; +Cc: miles.lane, chris.snook, jcliburn, netdev, linux-kernel, Jie Yang
[ 25.059969] WARNING: at lib/dma-debug.c:816 check_unmap+0x383/0x55c()
[ 25.059976] Hardware name: 1000HE
[ 25.059984] ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
memory with wrong function [device address=0x0000000036b92802]
[size=90 bytes] [mapped as single] [unmapped as page]
use the wrong API when free dma. So when map dma use a flag to
demostrate whether it is 'pci_map_single' or 'pci_map_page'. When free
the dma, check the flags to select the right APIs('pci_unmap_single' or 'pci_unmap_page').
set the flags type to u16 instead of unsigned long on David's comments.
Signed-off-by: Jie Yang <jie.yang@atheros.com>
---
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/atl1e/atl1e.h
index ba48220..490d3b3 100644
--- a/drivers/net/atl1e/atl1e.h
+++ b/drivers/net/atl1e/atl1e.h
@@ -377,10 +377,19 @@ struct atl1e_hw {
*/
struct atl1e_tx_buffer {
struct sk_buff *skb;
+ u16 flags;
+#define ATL1E_TX_PCIMAP_SINGLE 0x0001
+#define ATL1E_TX_PCIMAP_PAGE 0x0002
+#define ATL1E_TX_PCIMAP_TYPE_MASK 0x0003
u16 length;
dma_addr_t dma;
};
+#define ATL1E_SET_PCIMAP_TYPE(tx_buff, type) do { \
+ ((tx_buff)->flags) &= ~ATL1E_TX_PCIMAP_TYPE_MASK; \
+ ((tx_buff)->flags) |= (type); \
+ } while (0)
+
struct atl1e_rx_page {
dma_addr_t dma; /* receive rage DMA address */
u8 *addr; /* receive rage virtual address */
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 69b830f..955da73 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -635,7 +635,11 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
for (index = 0; index < ring_count; index++) {
tx_buffer = &tx_ring->tx_buffer[index];
if (tx_buffer->dma) {
- pci_unmap_page(pdev, tx_buffer->dma,
+ if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
+ pci_unmap_single(pdev, tx_buffer->dma,
+ tx_buffer->length, PCI_DMA_TODEVICE);
+ else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
+ pci_unmap_page(pdev, tx_buffer->dma,
tx_buffer->length, PCI_DMA_TODEVICE);
tx_buffer->dma = 0;
}
@@ -1220,7 +1224,11 @@ static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)
while (next_to_clean != hw_next_to_clean) {
tx_buffer = &tx_ring->tx_buffer[next_to_clean];
if (tx_buffer->dma) {
- pci_unmap_page(adapter->pdev, tx_buffer->dma,
+ if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
+ pci_unmap_single(adapter->pdev, tx_buffer->dma,
+ tx_buffer->length, PCI_DMA_TODEVICE);
+ else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
+ pci_unmap_page(adapter->pdev, tx_buffer->dma,
tx_buffer->length, PCI_DMA_TODEVICE);
tx_buffer->dma = 0;
}
@@ -1741,6 +1749,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
tx_buffer->length = map_len;
tx_buffer->dma = pci_map_single(adapter->pdev,
skb->data, hdr_len, PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_SINGLE);
mapped_len += map_len;
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1766,6 +1775,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
tx_buffer->dma =
pci_map_single(adapter->pdev, skb->data + mapped_len,
map_len, PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_SINGLE);
mapped_len += map_len;
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1801,6 +1811,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
(i * MAX_TX_BUF_LEN),
tx_buffer->length,
PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE);
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
((cpu_to_le32(tx_buffer->length) &
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 7:23 jie.yang
@ 2009-09-16 7:44 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2009-09-16 7:44 UTC (permalink / raw)
To: jie.yang; +Cc: miles.lane, chris.snook, jcliburn, netdev, linux-kernel
From: <jie.yang@atheros.com>
Date: Wed, 16 Sep 2009 15:23:04 +0800
> [ 25.059969] WARNING: at lib/dma-debug.c:816 check_unmap+0x383/0x55c()
> [ 25.059976] Hardware name: 1000HE
> [ 25.059984] ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
> memory with wrong function [device address=0x0000000036b92802]
> [size=90 bytes] [mapped as single] [unmapped as page]
>
> use the wrong API when free dma. So when map dma use a flag to
> demostrate whether it is 'pci_map_single' or 'pci_map_page'. When free
> the dma, check the flags to select the right APIs('pci_unmap_single' or 'pci_unmap_page').
>
> set the flags type to u16 instead of unsigned long on David's comments.
>
> Signed-off-by: Jie Yang <jie.yang@atheros.com>
Your email client has corrupted this patch (turning tab characters
into spaces, etc.) making it unusable.
^ permalink raw reply [flat|nested] 11+ messages in thread
* [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
@ 2009-09-16 9:28 jie.yang
2009-09-17 17:27 ` David Miller
0 siblings, 1 reply; 11+ messages in thread
From: jie.yang @ 2009-09-16 9:28 UTC (permalink / raw)
To: davem; +Cc: miles.lane, chris.snook, jcliburn, netdev, linux-kernel, Jie Yang
use the wrong API when free dma. So when map dma use a flag to demostrate whether it is 'pci_map_single' or 'pci_map_page'. When free the dma, check the flags to select the right APIs('pci_unmap_single' or 'pci_unmap_page').
set the flags type to u16 instead of unsigned long on David's comments.
Signed-off-by: Jie Yang <jie.yang@atheros.com>
---
diff --git a/drivers/net/atl1e/atl1e.h b/drivers/net/atl1e/atl1e.h
index ba48220..490d3b3 100644
--- a/drivers/net/atl1e/atl1e.h
+++ b/drivers/net/atl1e/atl1e.h
@@ -377,10 +377,19 @@ struct atl1e_hw {
*/
struct atl1e_tx_buffer {
struct sk_buff *skb;
+ u16 flags;
+#define ATL1E_TX_PCIMAP_SINGLE 0x0001
+#define ATL1E_TX_PCIMAP_PAGE 0x0002
+#define ATL1E_TX_PCIMAP_TYPE_MASK 0x0003
u16 length;
dma_addr_t dma;
};
+#define ATL1E_SET_PCIMAP_TYPE(tx_buff, type) do { \
+ ((tx_buff)->flags) &= ~ATL1E_TX_PCIMAP_TYPE_MASK; \
+ ((tx_buff)->flags) |= (type); \
+ } while (0)
+
struct atl1e_rx_page {
dma_addr_t dma; /* receive rage DMA address */
u8 *addr; /* receive rage virtual address */
diff --git a/drivers/net/atl1e/atl1e_main.c b/drivers/net/atl1e/atl1e_main.c
index 69b830f..955da73 100644
--- a/drivers/net/atl1e/atl1e_main.c
+++ b/drivers/net/atl1e/atl1e_main.c
@@ -635,7 +635,11 @@ static void atl1e_clean_tx_ring(struct atl1e_adapter *adapter)
for (index = 0; index < ring_count; index++) {
tx_buffer = &tx_ring->tx_buffer[index];
if (tx_buffer->dma) {
- pci_unmap_page(pdev, tx_buffer->dma,
+ if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
+ pci_unmap_single(pdev, tx_buffer->dma,
+ tx_buffer->length, PCI_DMA_TODEVICE);
+ else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
+ pci_unmap_page(pdev, tx_buffer->dma,
tx_buffer->length, PCI_DMA_TODEVICE);
tx_buffer->dma = 0;
}
@@ -1220,7 +1224,11 @@ static bool atl1e_clean_tx_irq(struct atl1e_adapter *adapter)
while (next_to_clean != hw_next_to_clean) {
tx_buffer = &tx_ring->tx_buffer[next_to_clean];
if (tx_buffer->dma) {
- pci_unmap_page(adapter->pdev, tx_buffer->dma,
+ if (tx_buffer->flags & ATL1E_TX_PCIMAP_SINGLE)
+ pci_unmap_single(adapter->pdev, tx_buffer->dma,
+ tx_buffer->length, PCI_DMA_TODEVICE);
+ else if (tx_buffer->flags & ATL1E_TX_PCIMAP_PAGE)
+ pci_unmap_page(adapter->pdev, tx_buffer->dma,
tx_buffer->length, PCI_DMA_TODEVICE);
tx_buffer->dma = 0;
}
@@ -1741,6 +1749,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
tx_buffer->length = map_len;
tx_buffer->dma = pci_map_single(adapter->pdev,
skb->data, hdr_len, PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_SINGLE);
mapped_len += map_len;
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1766,6 +1775,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
tx_buffer->dma =
pci_map_single(adapter->pdev, skb->data + mapped_len,
map_len, PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_SINGLE);
mapped_len += map_len;
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
@@ -1801,6 +1811,7 @@ static void atl1e_tx_map(struct atl1e_adapter *adapter,
(i * MAX_TX_BUF_LEN),
tx_buffer->length,
PCI_DMA_TODEVICE);
+ ATL1E_SET_PCIMAP_TYPE(tx_buffer, ATL1E_TX_PCIMAP_PAGE);
use_tpd->buffer_addr = cpu_to_le64(tx_buffer->dma);
use_tpd->word2 = (use_tpd->word2 & (~TPD_BUFLEN_MASK)) |
((cpu_to_le32(tx_buffer->length) &
^ permalink raw reply related [flat|nested] 11+ messages in thread* Re: [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA
2009-09-16 9:28 jie.yang
@ 2009-09-17 17:27 ` David Miller
0 siblings, 0 replies; 11+ messages in thread
From: David Miller @ 2009-09-17 17:27 UTC (permalink / raw)
To: jie.yang; +Cc: miles.lane, chris.snook, jcliburn, netdev, linux-kernel
From: <jie.yang@atheros.com>
Date: Wed, 16 Sep 2009 17:28:30 +0800
> use the wrong API when free dma. So when map dma use a flag to demostrate whether it is 'pci_map_single' or 'pci_map_page'. When free the dma, check the flags to select the right APIs('pci_unmap_single' or 'pci_unmap_page').
>
> set the flags type to u16 instead of unsigned long on David's comments.
>
> Signed-off-by: Jie Yang <jie.yang@atheros.com>
Applied.
^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2009-09-17 17:27 UTC | newest]
Thread overview: 11+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2009-09-16 6:21 [Patch net-next]atl1e:fix 2.6.31-git4 -- ATL1E 0000:03:00.0: DMA-API: device driver frees DMA jie.yang
2009-09-16 6:57 ` David Miller
2009-09-16 9:10 ` Daniel Walker
2009-09-16 9:31 ` Jie Yang
2009-09-16 9:47 ` David Miller
2009-09-16 9:51 ` Cyrill Gorcunov
2009-09-16 9:54 ` Jie Yang
-- strict thread matches above, loose matches on Subject: below --
2009-09-16 7:23 jie.yang
2009-09-16 7:44 ` David Miller
2009-09-16 9:28 jie.yang
2009-09-17 17:27 ` David Miller
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).