mail archive of the barebox mailing list
 help / color / mirror / Atom feed
From: Andrey Smirnov <andrew.smirnov@gmail.com>
To: barebox@lists.infradead.org
Subject: [RESEND v3 08/52] net: fec_imx: Use dma mapping functions
Date: Thu,  7 Jun 2018 06:00:24 -0700	[thread overview]
Message-ID: <20180607130108.5339-9-andrew.smirnov@gmail.com> (raw)
In-Reply-To: <20180607130108.5339-1-andrew.smirnov@gmail.com>

From: Sascha Hauer <s.hauer@pengutronix.de>

Rather than doing DMA on the input buffer address get a proper DMA
address from the mapping functions.

Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
---
 drivers/net/fec_imx.c | 15 +++++++++------
 drivers/net/fec_imx.h |  1 +
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/drivers/net/fec_imx.c b/drivers/net/fec_imx.c
index 33599dd82..0ca594082 100644
--- a/drivers/net/fec_imx.c
+++ b/drivers/net/fec_imx.c
@@ -453,6 +453,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length)
 {
 	unsigned int status;
 	uint64_t tmo;
+	dma_addr_t dma;
 
 	/*
 	 * This routine transmits one frame.  This routine only accepts
@@ -466,7 +467,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length)
 		return -1;
 	}
 
-	if ((uint32_t)eth_data & (DB_DATA_ALIGNMENT-1))
+	if ((unsigned long)eth_data & (DB_DATA_ALIGNMENT - 1))
 		dev_warn(&dev->dev, "Transmit data not aligned: %p!\n", eth_data);
 
 	/*
@@ -479,10 +480,12 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length)
 
 	writew(data_length, &fec->tbd_base[fec->tbd_index].data_length);
 
-	writel((uint32_t)(eth_data), &fec->tbd_base[fec->tbd_index].data_pointer);
+	dma = dma_map_single(fec->dev, eth_data, data_length, DMA_TO_DEVICE);
+	if (dma_mapping_error(fec->dev, dma))
+		return -EIO;
+
+	writel((uint32_t)(dma), &fec->tbd_base[fec->tbd_index].data_pointer);
 
-	dma_sync_single_for_device((unsigned long)eth_data, data_length,
-				   DMA_TO_DEVICE);
 	/*
 	 * update BD's status now
 	 * This block:
@@ -505,8 +508,7 @@ static int fec_send(struct eth_device *dev, void *eth_data, int data_length)
 			break;
 		}
 	}
-	dma_sync_single_for_cpu((unsigned long)eth_data, data_length,
-				DMA_TO_DEVICE);
+	dma_unmap_single(fec->dev, dma, data_length, DMA_TO_DEVICE);
 
 	/* for next transmission use the other buffer */
 	if (fec->tbd_index)
@@ -748,6 +750,7 @@ static int fec_probe(struct device_d *dev)
 
 	fec = xzalloc(sizeof(*fec));
 	fec->type = type;
+	fec->dev = dev;
 	edev = &fec->edev;
 	dev->priv = fec;
 	edev->priv = fec;
diff --git a/drivers/net/fec_imx.h b/drivers/net/fec_imx.h
index 561de0890..e3f60dd66 100644
--- a/drivers/net/fec_imx.h
+++ b/drivers/net/fec_imx.h
@@ -149,6 +149,7 @@ enum fec_opt_clock {
  */
 struct fec_priv {
 	struct eth_device edev;
+	struct device_d *dev;
 	void __iomem *regs;
 	struct buffer_descriptor __iomem *rbd_base;	/* RBD ring                  */
 	int rbd_index;				/* next receive BD to read   */
-- 
2.17.0


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

  parent reply	other threads:[~2018-06-07 13:01 UTC|newest]

Thread overview: 55+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2018-06-07 13:00 [RESEND v3 00/52] ARM: i.MX8MQ and EVK support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 01/52] ARM: i.MX: xload: Fix compiler warning Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 02/52] ARM: i.MX: compile arm32 specific errata only for CPU32 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 03/52] ARM: Add i.MX8 support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 04/52] aarch64: Add i.MX8 debug UART support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 05/52] Include our own include/dt-bindings Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 06/52] mci: imx-esdhc: use dma mapping functions Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 07/52] net: fec_imx: remove unnecessary DMA sync ops Andrey Smirnov
2018-06-07 13:00 ` Andrey Smirnov [this message]
2018-06-07 13:00 ` [RESEND v3 09/52] net: fec_imx: Make use of IS_ALIGNED Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 10/52] clock: Add i.MX8MQ clock driver Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 11/52] serial: i.MX: Add i.MX8 support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 12/52] mmc: i.MX esdhc: " Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 13/52] gpio: i.MX: Add i.MX8mq support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 14/52] ARM: i.MX: ocotp: Add i.MX8MQ support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 15/52] ARM: i.MX: Split shared CCM code into a separate file Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 16/52] ARM: i.MX: Add IOMUX pad constants for i.MX8 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 17/52] ARM: i.MX: Add basic CCM " Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 18/52] ARM: Add constants and helpers for system counter interface Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 19/52] clocksource: armv8-timer: Convert explicit assembly into helpers Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 20/52] ARM: i.MX8: Initialize system counter Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 21/52] ARM: i.MX: boot: Fix address casting on 64-bit platforms Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 22/52] ARM: boot: Add trivial i.MX8 support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 23/52] ARM: i.MX: xload-esdhc: Rework to make code be less i.MX6-specific Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 24/52] ARM: i.MX: xload-esdhc: Allow custom buffer address, device offset Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 25/52] ARM: i.MX: xload-esdhc: Add support for i.MX8 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 26/52] pinctrl: i.MX: " Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 27/52] Documentation: imx: Change block size for 'dd' to 1024 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 28/52] Documentation: i.MX: Add missing <soctype> Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 29/52] clocksource: armv8-timer: Make armv8_clocksource_read() static Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 30/52] clocksource: armv8-timer: Make use of postcore_platform_driver() Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 31/52] Port <linux/iopoll.h> from U-Boot Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 32/52] common/clock: Move delay and timeout functions to clock.h Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 33/52] clock: Use udelay() to implement mdelay() Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 34/52] ARM: i.MX8: Add DDRC PHY and DDR CTL base addresses Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 35/52] Kbuild: Add $(quote) Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 36/52] Add builtin firmware support Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 37/52] ARM: i.MX8: Add DDRC PHY support code Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 38/52] ARM: Specify HAVE_PBL_IMAGE for CPU_64 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 39/52] ARM: lib64: Make string functions aware of MMU configuration Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 40/52] ARM: mmu: Make use of dsb() and isb() helpers Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 41/52] ARM: cache: Remove unused cache ops struct Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 42/52] ARM: no-mmu: Disable building for ARMv8 Andrey Smirnov
2018-06-07 13:00 ` [RESEND v3 43/52] ARM: interrupts64: Include ESR value in exception traceback Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 44/52] ARM: mmu64: Trivial code simplification Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 45/52] ARM: mmu64: Make use of create_table() Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 46/52] ARM: mmu64: Convert flags in arch_remap_range() Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 47/52] ARM: include: dma: Add missing no-MMU stubs Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 48/52] scripts: imx-image: Drop error return from write_dcd() Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 49/52] scripts: imx-image: Limit v2 header size to HEADER_LEN Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 50/52] scripts: imx-image: Share the code to write barebox header Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 51/52] scripts: imx-image: Add i.MX8MQ support Andrey Smirnov
2018-06-07 13:01 ` [RESEND v3 52/52] ARM: i.MX8: Add i.MX8mq EVK support Andrey Smirnov
2018-06-08  6:46 ` [RESEND v3 00/52] ARM: i.MX8MQ and " Sascha Hauer
2018-06-11 17:56   ` Andrey Smirnov

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=20180607130108.5339-9-andrew.smirnov@gmail.com \
    --to=andrew.smirnov@gmail.com \
    --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