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 17/24] net: orion-gbe: convert to streaming DMA ops
Date: Sun,  1 Mar 2015 14:17:15 +0100	[thread overview]
Message-ID: <1425215842-6982-18-git-send-email-dev@lynxeye.de> (raw)
In-Reply-To: <1425215842-6982-1-git-send-email-dev@lynxeye.de>

Move to the common streaming DMA ops in order to get rid of
the direct usage of the ARM MMU functions for the cache
maintenance.

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

diff --git a/drivers/net/orion-gbe.c b/drivers/net/orion-gbe.c
index ad1fc66..4235122 100644
--- a/drivers/net/orion-gbe.c
+++ b/drivers/net/orion-gbe.c
@@ -33,7 +33,6 @@
 #include <net.h>
 #include <of_net.h>
 #include <linux/sizes.h>
-#include <asm/mmu.h>
 #include <linux/clk.h>
 #include <linux/err.h>
 #include <linux/mbus.h>
@@ -243,7 +242,7 @@ static int port_send(struct eth_device *edev, void *data, int len)
 	int ret;
 
 	/* flush transmit data */
-	dma_flush_range((unsigned long)data, (unsigned long)data+len);
+	dma_sync_single_for_device((unsigned long)data, len, DMA_TO_DEVICE);
 
 	txdesc->cmd_sts = TXDESC_OWNED_BY_DMA;
 	txdesc->cmd_sts |= TXDESC_FIRST | TXDESC_LAST;
@@ -258,6 +257,7 @@ static int port_send(struct eth_device *edev, void *data, int len)
 	/* wait for packet transmit completion */
 	ret = wait_on_timeout(TRANSFER_TIMEOUT,
 		      (readl(&txdesc->cmd_sts) & TXDESC_OWNED_BY_DMA) == 0);
+	dma_sync_single_for_cpu((unsigned long)data, len, DMA_TO_DEVICE);
 	if (ret) {
 		dev_err(&edev->dev, "transmit timeout\n");
 		return ret;
@@ -301,12 +301,15 @@ static int port_recv(struct eth_device *edev)
 	}
 
 	/* invalidate current receive buffer */
-	dma_inv_range((unsigned long)rxdesc->buf_ptr,
-		      (unsigned long)rxdesc->buf_ptr +
-		      ALIGN(PKTSIZE, 8));
+	dma_sync_single_for_cpu((unsigned long)rxdesc->buf_ptr,
+				ALIGN(PKTSIZE, 8), DMA_FROM_DEVICE);
 
 	/* received packet is padded with two null bytes */
 	net_receive(edev, rxdesc->buf_ptr + 0x2, rxdesc->byte_cnt - 0x2);
+
+	dma_sync_single_for_device((unsigned long)rxdesc->buf_ptr,
+				   ALIGN(PKTSIZE, 8), DMA_FROM_DEVICE);
+
 	ret = 0;
 
 recv_err:
-- 
2.1.0


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

  parent reply	other threads:[~2015-03-01 13:19 UTC|newest]

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