mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Lucas Stach <dev@lynxeye.de>
To: barebox@lists.infradead.org
Subject: [PATCH RFT 16/24] net: macb: convert to streaming DMA ops
Date: Thu, 12 Feb 2015 22:39:52 +0100	[thread overview]
Message-ID: <1423777200-22965-17-git-send-email-dev@lynxeye.de> (raw)
In-Reply-To: <1423777200-22965-1-git-send-email-dev@lynxeye.de>

Signed-off-by: Lucas Stach <dev@lynxeye.de>
---
 drivers/net/macb.c | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/drivers/net/macb.c b/drivers/net/macb.c
index b941c27..957e4a7 100644
--- a/drivers/net/macb.c
+++ b/drivers/net/macb.c
@@ -47,7 +47,6 @@
 #include <platform_data/macb.h>
 #include <linux/clk.h>
 #include <linux/err.h>
-#include <asm/mmu.h>
 #include <linux/phy.h>
 
 #include "macb.h"
@@ -122,7 +121,7 @@ static int macb_send(struct eth_device *edev, void *packet,
 	macb->tx_ring[tx_head].ctrl = ctrl;
 	macb->tx_ring[tx_head].addr = (ulong)packet;
 	barrier();
-	dma_flush_range((ulong) packet, (ulong)packet + length);
+	dma_sync_single_for_device((unsigned long)packet, length, DMA_TO_DEVICE);
 	macb_writel(macb, NCR, MACB_BIT(TE) | MACB_BIT(RE) | MACB_BIT(TSTART));
 
 	start = get_time_ns();
@@ -135,6 +134,7 @@ static int macb_send(struct eth_device *edev, void *packet,
 			break;
 		}
 	} while (!is_timeout(start, 100 * MSECOND));
+	dma_sync_single_for_cpu((unsigned long)packet, length, DMA_TO_DEVICE);
 
 	if (ctrl & MACB_BIT(TX_UNDERRUN))
 		dev_err(macb->dev, "TX underrun\n");
@@ -188,7 +188,11 @@ static int gem_recv(struct eth_device *edev)
 		status = macb->rx_ring[macb->rx_tail].ctrl;
 		length = MACB_BFEXT(RX_FRMLEN, status);
 		buffer = macb->rx_buffer + macb->rx_buffer_size * macb->rx_tail;
+		dma_sync_single_for_cpu((unsigned long)buffer, length,
+					DMA_FROM_DEVICE);
 		net_receive(edev, buffer, length);
+		dma_sync_single_for_device((unsigned long)buffer, length,
+					   DMA_FROM_DEVICE);
 		macb->rx_ring[macb->rx_tail].addr &= ~MACB_BIT(RX_USED);
 		barrier();
 
-- 
2.1.0


_______________________________________________
barebox mailing list
barebox@lists.infradead.org
http://lists.infradead.org/mailman/listinfo/barebox

  parent reply	other threads:[~2015-02-12 21:41 UTC|newest]

Thread overview: 29+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-02-12 21:39 [PATCH RFT 00/24] Phasing out direct usage of asm/mmu.h on ARM Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 01/24] usb: gadget: include common.h in header Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 02/24] ARM: move virt<->phys translation to io.h Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 03/24] dma: add streaming DMA ops Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 04/24] ARM: move DMA alloc functions to dma.h Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 05/24] ARM: implement streaming DMA ops Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 06/24] AHCI: convert to " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 07/24] MCI: dw-mmc: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 08/24] MCI: imx: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 09/24] MCI: tegra-sdmmc: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 10/24] net: arc-emac: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 11/24] net: cpsw: " Lucas Stach
2015-02-13 19:44   ` Sascha Hauer
2015-02-12 21:39 ` [PATCH RFT 12/24] net: at91_ether: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 13/24] net: davinci_emac: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 14/24] net: designware: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 15/24] net: fec: " Lucas Stach
2015-02-12 21:39 ` Lucas Stach [this message]
2015-02-12 21:39 ` [PATCH RFT 17/24] net: orion-gbe: " Lucas Stach
2015-02-12 22:40   ` Sebastian Hesselbarth
2015-02-16 10:45     ` Sebastian Hesselbarth
2015-02-12 21:39 ` [PATCH RFT 18/24] net: rtl8169: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 19/24] net: xgmac: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 20/24] usb: gadget: fsl_udc: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 21/24] usb: host: ehci: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 22/24] usb: host: ohci: " Lucas Stach
2015-02-12 21:39 ` [PATCH RFT 23/24] ARM: bcm2835: mbox: " Lucas Stach
2015-02-12 21:40 ` [PATCH RFT 24/24] ARM: MMU: unexport cache maintenance functions Lucas Stach
2015-02-13 19:48 ` [PATCH RFT 00/24] Phasing out direct usage of asm/mmu.h on ARM Sascha Hauer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1423777200-22965-17-git-send-email-dev@lynxeye.de \
    --to=dev@lynxeye.de \
    --cc=barebox@lists.infradead.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox