diff options
| author | Tom Rini <trini@konsulko.com> | 2020-04-22 08:58:41 -0400 |
|---|---|---|
| committer | Tom Rini <trini@konsulko.com> | 2020-04-22 08:58:41 -0400 |
| commit | 2b63959e30f23ef3088dbed6626341c6d8371a66 (patch) | |
| tree | 1ea89ae7672fbb34886d05c0f6eabfea4d0e00d3 /drivers/mmc/tmio-common.c | |
| parent | 2f2031e647564be8121c05507fbec8e6c5bc0e63 (diff) | |
| parent | 2448c34f9fc26d3c459e6e7b28c6357656bfa287 (diff) | |
Merge tag 'mmc-2020-4-22' of https://gitlab.denx.de/u-boot/custodians/u-boot-mmc
- iproc_sdhci memory leak fix and enable R1B resp quirk
- more mmc cmds and several mmc updates from Heinirich
- Use bounce buffer for tmio sdhci
- Alignment check for tmio sdhci
Diffstat (limited to 'drivers/mmc/tmio-common.c')
| -rw-r--r-- | drivers/mmc/tmio-common.c | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/drivers/mmc/tmio-common.c b/drivers/mmc/tmio-common.c index faf18191b30..1dc13db9eaa 100644 --- a/drivers/mmc/tmio-common.c +++ b/drivers/mmc/tmio-common.c @@ -358,14 +358,16 @@ static int tmio_sd_dma_xfer(struct udevice *dev, struct mmc_data *data) } /* check if the address is DMA'able */ -static bool tmio_sd_addr_is_dmaable(const char *src) +static bool tmio_sd_addr_is_dmaable(struct mmc_data *data) { - uintptr_t addr = (uintptr_t)src; + uintptr_t addr = (uintptr_t)data->src; if (!IS_ALIGNED(addr, TMIO_SD_DMA_MINALIGN)) return false; #if defined(CONFIG_RCAR_GEN3) + if (!(data->flags & MMC_DATA_READ) && !IS_ALIGNED(addr, 128)) + return false; /* Gen3 DMA has 32bit limit */ if (addr >> 32) return false; @@ -480,7 +482,7 @@ int tmio_sd_send_cmd(struct udevice *dev, struct mmc_cmd *cmd, if (data) { /* use DMA if the HW supports it and the buffer is aligned */ if (priv->caps & TMIO_SD_CAP_DMA_INTERNAL && - tmio_sd_addr_is_dmaable(data->src)) + tmio_sd_addr_is_dmaable(data)) ret = tmio_sd_dma_xfer(dev, data); else ret = tmio_sd_pio_xfer(dev, cmd, data); |