colin/u-boot
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: sdhci: reduce code duplication for aligned buffer

Browse Source 
The same code is run for both SDHCI_QUIRK_32BIT_DMA_ADDR and
define(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER).

Unify the code.

Signed-off-by: Masahiro Yamada <yamada.masahiro@socionext.com>
Reviewed-by: Jaehoon Chung <jh80.chung@samsung.com>
This commit is contained in:
Masahiro Yamada
2020-02-14 16:40:22 +09:00
committed by Peng Fan
parent c8cc18b7a7
commit f5df6aa1e6
2 changed files with 10 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/mmc/sdhci.c
View File

@@ -140,27 +140,16 @@ static void sdhci_prepare_dma(struct sdhci_host *host, struct mmc_data *data,
sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL); sdhci_writeb(host, ctrl, SDHCI_HOST_CONTROL);
if (host->flags & USE_SDMA) { if (host->flags & USE_SDMA) {
if ((host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) && if (host->force_align_buffer ||
(host->start_addr & 0x7) != 0x0) { (host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR &&
(host->start_addr & 0x7) != 0x0)) {
*is_aligned = 0; *is_aligned = 0;
host->start_addr = (unsigned long)host->align_buffer; host->start_addr = (unsigned long)host->align_buffer;
if (data->flags != MMC_DATA_READ) if (data->flags != MMC_DATA_READ)
memcpy(host->align_buffer, data->src, memcpy(host->align_buffer, data->src,
trans_bytes); trans_bytes);
} }
#if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER)
/*
* Always use this bounce-buffer when
* CONFIG_FIXED_SDHCI_ALIGNED_BUFFER is defined
*/
*is_aligned = 0;
host->start_addr = (unsigned long)host->align_buffer;
if (data->flags != MMC_DATA_READ)
memcpy(host->align_buffer, data->src, trans_bytes);
#endif
sdhci_writel(host, host->start_addr, SDHCI_DMA_ADDRESS); sdhci_writel(host, host->start_addr, SDHCI_DMA_ADDRESS);
} else if (host->flags & (USE_ADMA | USE_ADMA64)) { } else if (host->flags & (USE_ADMA | USE_ADMA64)) {
sdhci_prepare_adma_table(host, data); sdhci_prepare_adma_table(host, data);
@@ -627,6 +616,11 @@ static int sdhci_init(struct mmc *mmc)
#if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER) #if defined(CONFIG_FIXED_SDHCI_ALIGNED_BUFFER)
host->align_buffer = (void *)CONFIG_FIXED_SDHCI_ALIGNED_BUFFER; host->align_buffer = (void *)CONFIG_FIXED_SDHCI_ALIGNED_BUFFER;
/*
* Always use this bounce-buffer when CONFIG_FIXED_SDHCI_ALIGNED_BUFFER
* is defined.
*/
host->force_align_buffer = true;
#else #else
if (host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) { if (host->quirks & SDHCI_QUIRK_32BIT_DMA_ADDR) {
host->align_buffer = memalign(8, 512 * 1024); host->align_buffer = memalign(8, 512 * 1024);

2
include/sdhci.h
View File

@@ -9,6 +9,7 @@
#ifndef __SDHCI_HW_H #ifndef __SDHCI_HW_H
#define __SDHCI_HW_H #define __SDHCI_HW_H
#include <linux/types.h>
#include <asm/io.h> #include <asm/io.h>
#include <mmc.h> #include <mmc.h>
#include <asm/gpio.h> #include <asm/gpio.h>
@@ -322,6 +323,7 @@ struct sdhci_host {
struct mmc_config cfg; struct mmc_config cfg;
void *align_buffer; void *align_buffer;
bool force_align_buffer;
dma_addr_t start_addr; dma_addr_t start_addr;
int flags; int flags;
#define USE_SDMA (0x1 << 0) #define USE_SDMA (0x1 << 0)