From mboxrd@z Thu Jan 1 00:00:00 1970 From: Sascha Hauer Subject: [PATCH] fec: replace flush_dcache_range with dma_sync_single Date: Thu, 29 Jan 2009 10:03:09 +0100 Message-ID: <1233219791-18691-8-git-send-email-s.hauer@pengutronix.de> References: <1233219791-18691-1-git-send-email-s.hauer@pengutronix.de> <1233219791-18691-2-git-send-email-s.hauer@pengutronix.de> <1233219791-18691-3-git-send-email-s.hauer@pengutronix.de> <1233219791-18691-4-git-send-email-s.hauer@pengutronix.de> <1233219791-18691-5-git-send-email-s.hauer@pengutronix.de> <1233219791-18691-6-git-send-email-s.hauer@pengutronix.de> <1233219791-18691-7-git-send-email-s.hauer@pengutronix.de> Cc: David Miller , Greg Ungerer , Sascha Hauer To: netdev@vger.kernel.org Return-path: Received: from metis.ext.pengutronix.de ([92.198.50.35]:55154 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1753246AbZA2JFu (ORCPT ); Thu, 29 Jan 2009 04:05:50 -0500 In-Reply-To: <1233219791-18691-7-git-send-email-s.hauer@pengutronix.de> Sender: netdev-owner@vger.kernel.org List-ID: 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 Acked-by: Greg Ungerer --- 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 cab07ec..a17dc6a 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 -- 1.5.6.5