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 08/24] MCI: imx: convert to streaming DMA ops
Date: Thu, 12 Feb 2015 22:39:44 +0100	[thread overview]
Message-ID: <1423777200-22965-9-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/mci/imx-esdhc.c | 28 +++++++++++++++++-----------
 1 file changed, 17 insertions(+), 11 deletions(-)

diff --git a/drivers/mci/imx-esdhc.c b/drivers/mci/imx-esdhc.c
index 23bdc1f..8b45500 100644
--- a/drivers/mci/imx-esdhc.c
+++ b/drivers/mci/imx-esdhc.c
@@ -22,6 +22,7 @@
  */
 #include <config.h>
 #include <common.h>
+#include <dma.h>
 #include <driver.h>
 #include <init.h>
 #include <of.h>
@@ -31,7 +32,6 @@
 #include <io.h>
 #include <linux/clk.h>
 #include <linux/err.h>
-#include <asm/mmu.h>
 #include <mach/generic.h>
 #include <mach/esdhc.h>
 #include <gpio.h>
@@ -211,6 +211,7 @@ esdhc_send_cmd(struct mci_host *mci, struct mci_cmd *cmd, struct mci_data *data)
 	u32	irqstat;
 	struct fsl_esdhc_host *host = to_fsl_esdhc(mci);
 	void __iomem *regs = host->regs;
+	unsigned int num_bytes = 0;
 	int ret;
 
 	esdhc_write32(regs + SDHCI_INT_STATUS, -1);
@@ -225,12 +226,15 @@ esdhc_send_cmd(struct mci_host *mci, struct mci_cmd *cmd, struct mci_data *data)
 		err = esdhc_setup_data(mci, data);
 		if(err)
 			return err;
-		if (data->flags & MMC_DATA_WRITE) {
-			dma_flush_range((unsigned long)data->src,
-				(unsigned long)(data->src + data->blocks * 512));
-		} else
-			dma_clean_range((unsigned long)data->src,
-				(unsigned long)(data->src + data->blocks * 512));
+
+		num_bytes = data->blocks * data->blocksize;
+
+		if (data->flags & MMC_DATA_WRITE)
+			dma_sync_single_for_device((unsigned long)data->src,
+						   num_bytes, DMA_TO_DEVICE);
+		else
+			dma_sync_single_for_device((unsigned long)data->dest,
+						   num_bytes, DMA_FROM_DEVICE);
 
 	}
 
@@ -313,10 +317,12 @@ esdhc_send_cmd(struct mci_host *mci, struct mci_cmd *cmd, struct mci_data *data)
 		} while (!(irqstat & IRQSTAT_TC) &&
 				(esdhc_read32(regs + SDHCI_PRESENT_STATE) & PRSSTAT_DLA));
 
-		if (data->flags & MMC_DATA_READ) {
-			dma_inv_range((unsigned long)data->dest,
-					(unsigned long)(data->dest + data->blocks * 512));
-		}
+		if (data->flags & MMC_DATA_WRITE)
+			dma_sync_single_for_cpu((unsigned long)data->src,
+						num_bytes, DMA_TO_DEVICE);
+		else
+			dma_sync_single_for_cpu((unsigned long)data->dest,
+						num_bytes, DMA_FROM_DEVICE);
 #endif
 	}
 
-- 
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 ` Lucas Stach [this message]
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 ` [PATCH RFT 16/24] net: macb: " Lucas Stach
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-9-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