diff options
| author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-01-28 23:03:09 +0000 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-02-01 00:58:24 -0800 |
| commit | ccdc4f198193eb4956b8dbc00745270525c4cd6e (patch) | |
| tree | 77efa737a2ee47692e6c09250f0cf0da3ae5a220 | |
| parent | 43268dcea7512cc10bc2542f20ce37971ecfeb48 (diff) | |
| download | blackbird-op-linux-ccdc4f198193eb4956b8dbc00745270525c4cd6e.tar.gz blackbird-op-linux-ccdc4f198193eb4956b8dbc00745270525c4cd6e.zip | |
fec: replace flush_dcache_range with dma_sync_single
flush_dcache_range is not portable across architectures. Use
dma_sync_single instead. Also, the memory must be synchronised in the
receive path aswell.
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Greg Ungerer <gerg@uclinux.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | drivers/net/fec.c | 7 |
1 files changed, 5 insertions, 2 deletions
diff --git a/drivers/net/fec.c b/drivers/net/fec.c index cab07eced06e..a17dc6af30c3 100644 --- a/drivers/net/fec.c +++ b/drivers/net/fec.c @@ -356,8 +356,8 @@ fec_enet_start_xmit(struct sk_buff *skb, struct net_device *dev) /* Push the data cache so the CPM does not get stale memory * data. */ - flush_dcache_range((unsigned long)skb->data, - (unsigned long)skb->data + skb->len); + dma_sync_single(NULL, bdp->cbd_bufaddr, + bdp->cbd_datlen, DMA_TO_DEVICE); /* Send it on its way. Tell FEC it's ready, interrupt when done, * it's the last BD of the frame, and to put the CRC on the end. @@ -630,6 +630,9 @@ while (!((status = bdp->cbd_sc) & BD_ENET_RX_EMPTY)) { dev->stats.rx_bytes += pkt_len; data = (__u8*)__va(bdp->cbd_bufaddr); + dma_sync_single(NULL, (unsigned long)__pa(data), + pkt_len - 4, DMA_FROM_DEVICE); + /* This does 16 byte alignment, exactly what we need. * The packet length includes FCS, but we don't want to * include that when passing upstream as it messes up |
