From patchwork Tue Jan 27 10:40:02 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Sascha Hauer X-Patchwork-Id: 20441 X-Patchwork-Delegate: davem@davemloft.net Return-Path: X-Original-To: patchwork-incoming@ozlabs.org Delivered-To: patchwork-incoming@ozlabs.org Received: from vger.kernel.org (vger.kernel.org [209.132.176.167]) by ozlabs.org (Postfix) with ESMTP id 50424DE0E3 for ; Tue, 27 Jan 2009 21:42:33 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753216AbZA0Km2 (ORCPT ); Tue, 27 Jan 2009 05:42:28 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1753200AbZA0Km2 (ORCPT ); Tue, 27 Jan 2009 05:42:28 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:47155 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752182AbZA0Km1 (ORCPT ); Tue, 27 Jan 2009 05:42:27 -0500 Received: from octopus.hi.pengutronix.de ([2001:6f8:1178:2:215:17ff:fe12:23b0]) by metis.ext.pengutronix.de with esmtp (Exim 4.63) (envelope-from ) id 1LRlMV-0007qN-Lb; Tue, 27 Jan 2009 11:40:07 +0100 Received: from sha by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1LRlMS-0006Nb-JE; Tue, 27 Jan 2009 11:40:04 +0100 From: Sascha Hauer To: netdev@vger.kernel.org Cc: Greg Ungerer , frederic rodo , Sascha Hauer Subject: [PATCH] fec: replace flush_dcache_range with dma_sync_single Date: Tue, 27 Jan 2009 11:40:02 +0100 Message-Id: <1233052804-31228-8-git-send-email-s.hauer@pengutronix.de> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1233052804-31228-7-git-send-email-s.hauer@pengutronix.de> References: <1233052804-31228-1-git-send-email-s.hauer@pengutronix.de> <1233052804-31228-2-git-send-email-s.hauer@pengutronix.de> <1233052804-31228-3-git-send-email-s.hauer@pengutronix.de> <1233052804-31228-4-git-send-email-s.hauer@pengutronix.de> <1233052804-31228-5-git-send-email-s.hauer@pengutronix.de> <1233052804-31228-6-git-send-email-s.hauer@pengutronix.de> <1233052804-31228-7-git-send-email-s.hauer@pengutronix.de> X-SA-Exim-Connect-IP: 2001:6f8:1178:2:215:17ff:fe12:23b0 X-SA-Exim-Mail-From: sha@pengutronix.de X-SA-Exim-Scanned: No (on metis.ext.pengutronix.de); SAEximRunCond expanded to false X-PTX-Original-Recipient: netdev@vger.kernel.org Sender: netdev-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: netdev@vger.kernel.org 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 --- 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 f36ee43..6a54d1f 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