From patchwork Tue Jan 27 10:24:06 2009 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: y@pengutronix.de X-Patchwork-Id: 20428 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 12119DE0A6 for ; Tue, 27 Jan 2009 21:25:31 +1100 (EST) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752526AbZA0KZ0 (ORCPT ); Tue, 27 Jan 2009 05:25:26 -0500 Received: (majordomo@vger.kernel.org) by vger.kernel.org id S1752383AbZA0KZ0 (ORCPT ); Tue, 27 Jan 2009 05:25:26 -0500 Received: from metis.ext.pengutronix.de ([92.198.50.35]:42899 "EHLO metis.ext.pengutronix.de" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751225AbZA0KZZ (ORCPT ); Tue, 27 Jan 2009 05:25:25 -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 1LRl75-0007X5-B6; Tue, 27 Jan 2009 11:24:11 +0100 Received: from sha by octopus.hi.pengutronix.de with local (Exim 4.69) (envelope-from ) id 1LRl72-000705-9D; Tue, 27 Jan 2009 11:24:08 +0100 From: y@pengutronix.de To: netdev@vger.kernel.org Cc: Greg Ungerer , Sascha Hauer Subject: [PATCH] fec: replace flush_dcache_range with dma_sync_single Date: Tue, 27 Jan 2009 11:24:06 +0100 Message-Id: <1233051848-5994-8-git-send-email-y> X-Mailer: git-send-email 1.5.6.5 In-Reply-To: <1233051848-5994-7-git-send-email-y> References: <1233051848-5994-1-git-send-email-y> <1233051848-5994-2-git-send-email-y> <1233051848-5994-3-git-send-email-y> <1233051848-5994-4-git-send-email-y> <1233051848-5994-5-git-send-email-y> <1233051848-5994-6-git-send-email-y> <1233051848-5994-7-git-send-email-y> 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 From: Sascha Hauer 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