GitHub-Mirror/u-boot
2
0
Fork 0
mirror of https://github.com/Fishwaldo/u-boot.git synced 2025-06-19 21:21:25 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

mmc: fsl_esdhc_imx: use dma-mapping API

Browse source 
[ fsl_esdhc commit b1ba1460a4 ]

Use the dma_{map,unmap}_single() calls. These will take care of the
flushing and invalidation of caches.

Signed-off-by: Michael Walle <michael@walle.cc>
Signed-off-by: Sean Anderson <sean.anderson@seco.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
This commit is contained in:
Sean Anderson 2021-11-23 15:03:43 -05:00 • committed by Jaehoon Chung
parent ed9e9b2213
commit 0167267769
1 changed files with 15 additions and 35 deletions
Download patch file Download diff file Expand all files Collapse all files

50
drivers/mmc/fsl_esdhc_imx.c
View file

@ -38,6 +38,7 @@
#include <mapmem.h> #include <mapmem.h>
#include <dm/ofnode.h> #include <dm/ofnode.h>
#include <linux/iopoll.h> #include <linux/iopoll.h>
#include <linux/dma-mapping.h>
#ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE #ifndef ESDHCI_QUIRK_BROKEN_TIMEOUT_VALUE
#ifdef CONFIG_FSL_USDHC #ifdef CONFIG_FSL_USDHC
@ -171,6 +172,7 @@ struct fsl_esdhc_priv {
struct gpio_desc cd_gpio; struct gpio_desc cd_gpio;
struct gpio_desc wp_gpio; struct gpio_desc wp_gpio;
#endif #endif
dma_addr_t dma_addr;
}; };
/* Return the XFERTYP flags for a given command and data packet */ /* Return the XFERTYP flags for a given command and data packet */
@ -281,8 +283,8 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
struct mmc_data *data) struct mmc_data *data)
{ {
int timeout; int timeout;
uint trans_bytes = data->blocksize * data->blocks;
struct fsl_esdhc *regs = priv->esdhc_regs; struct fsl_esdhc *regs = priv->esdhc_regs;
dma_addr_t addr;
uint wml_value; uint wml_value;
wml_value = data->blocksize/4; wml_value = data->blocksize/4;
@ -293,17 +295,13 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
esdhc_clrsetbits32(&regs->wml, WML_RD_WML_MASK, wml_value); esdhc_clrsetbits32(&regs->wml, WML_RD_WML_MASK, wml_value);
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
addr = virt_to_phys((void *)(data->dest)); priv->dma_addr = dma_map_single(data->dest, trans_bytes,
if (upper_32_bits(addr)) mmc_get_dma_dir(data));
if (upper_32_bits(priv->dma_addr))
printf("Cannot use 64 bit addresses with SDMA\n"); printf("Cannot use 64 bit addresses with SDMA\n");
esdhc_write32(&regs->dsaddr, lower_32_bits(addr)); esdhc_write32(&regs->dsaddr, lower_32_bits(priv->dma_addr));
#endif #endif
} else { } else {
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
flush_dcache_range((ulong)data->src,
(ulong)data->src+data->blocks
*data->blocksize);
#endif
if (wml_value > WML_WR_WML_MAX) if (wml_value > WML_WR_WML_MAX)
wml_value = WML_WR_WML_MAX_VAL; wml_value = WML_WR_WML_MAX_VAL;
if (priv->wp_enable) { if (priv->wp_enable) {
@ -325,10 +323,11 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
esdhc_clrsetbits32(&regs->wml, WML_WR_WML_MASK, esdhc_clrsetbits32(&regs->wml, WML_WR_WML_MASK,
wml_value << 16); wml_value << 16);
#ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO #ifndef CONFIG_SYS_FSL_ESDHC_USE_PIO
addr = virt_to_phys((void *)(data->src)); priv->dma_addr = dma_map_single((void *)data->src, trans_bytes,
if (upper_32_bits(addr)) mmc_get_dma_dir(data));
if (upper_32_bits(priv->dma_addr))
printf("Cannot use 64 bit addresses with SDMA\n"); printf("Cannot use 64 bit addresses with SDMA\n");
esdhc_write32(&regs->dsaddr, lower_32_bits(addr)); esdhc_write32(&regs->dsaddr, lower_32_bits(priv->dma_addr));
#endif #endif
} }
@ -378,23 +377,6 @@ static int esdhc_setup_data(struct fsl_esdhc_priv *priv, struct mmc *mmc,
return 0; return 0;
} }
static void check_and_invalidate_dcache_range
(struct mmc_cmd *cmd,
struct mmc_data *data) {
unsigned start = 0;
unsigned end = 0;
unsigned size = roundup(ARCH_DMA_MINALIGN,
data->blocks*data->blocksize);
dma_addr_t addr;
addr = virt_to_phys((void *)(data->dest));
if (upper_32_bits(addr))
printf("Cannot use 64 bit addresses with SDMA\n");
start = lower_32_bits(addr);
end = start + size;
invalidate_dcache_range(start, end);
}
#ifdef CONFIG_MCF5441x #ifdef CONFIG_MCF5441x
/* /*
* Swaps 32-bit words to little-endian byte order. * Swaps 32-bit words to little-endian byte order.
@ -450,9 +432,6 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,
err = esdhc_setup_data(priv, mmc, data); err = esdhc_setup_data(priv, mmc, data);
if(err) if(err)
return err; return err;
if (data->flags & MMC_DATA_READ)
check_and_invalidate_dcache_range(cmd, data);
} }
/* Figure out the transfer arguments */ /* Figure out the transfer arguments */
@ -560,12 +539,13 @@ static int esdhc_send_cmd_common(struct fsl_esdhc_priv *priv, struct mmc *mmc,
* cache-fill during the DMA operations such as the * cache-fill during the DMA operations such as the
* speculative pre-fetching etc. * speculative pre-fetching etc.
*/ */
if (data->flags & MMC_DATA_READ) { dma_unmap_single(priv->dma_addr,
check_and_invalidate_dcache_range(cmd, data); data->blocks * data->blocksize,
mmc_get_dma_dir(data));
#ifdef CONFIG_MCF5441x #ifdef CONFIG_MCF5441x
if (data->flags & MMC_DATA_READ)
sd_swap_dma_buff(data); sd_swap_dma_buff(data);
#endif #endif
}
#endif #endif
} }