diff options
| author | Krzysztof Halasa <khc@pm.waw.pl> | 2009-07-14 11:01:54 +0000 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2009-08-16 14:18:08 -0700 |
| commit | 53cb98fa7cdb27d97f5c09db3eaeac9b4355d267 (patch) | |
| tree | e75928756cf7776e4f0cdd5a92b91c881b0f0db7 | |
| parent | 9089a1b0d68597991dd4c77f5d4d594eba91a4c5 (diff) | |
E100: work around the driver using streaming DMA mapping for RX descriptors.
[ Upstream commit 303d67c288319768b19ed8dbed429fef7eb7c275 ]
E100 places it's RX packet descriptors inside skb->data and uses them
with bidirectional streaming DMA mapping. Unfortunately it fails to
transfer skb->data ownership to the device after it reads the
descriptor's status, breaking on non-coherent (e.g., ARM) platforms.
This have to be converted to use coherent memory for the descriptors.
Signed-off-by: Krzysztof Halasa <khc@pm.waw.pl>
Acked-by: Jeff Kirsher <jeffrey.t.kirsher@intel.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Signed-off-by: Greg Kroah-Hartman <gregkh@suse.de>
| -rw-r--r-- | drivers/net/e100.c | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/drivers/net/e100.c b/drivers/net/e100.c index 0f9ee134855..014dfb67985 100644 --- a/drivers/net/e100.c +++ b/drivers/net/e100.c @@ -1762,6 +1762,9 @@ static int e100_rx_indicate(struct nic *nic, struct rx *rx, if (ioread8(&nic->csr->scb.status) & rus_no_res) nic->ru_running = RU_SUSPENDED; + pci_dma_sync_single_for_device(nic->pdev, rx->dma_addr, + sizeof(struct rfd), + PCI_DMA_BIDIRECTIONAL); return -ENODATA; } |