xiaomi-sm8450/android_kernel_xiaomi_sm8450
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: mmci: internalize dma_inprogress into mmci dma functions

Browse Source 
This patch internalizes the dma_inprogress into mmci dma interfaces.
This allows to simplify and prepare the next dma callbacks
for mmci host ops. dma_inprogress is called in mmci_dma_data_error
and mmci_dma_finalize.

Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
This commit is contained in:
Ludovic Barre
2018-09-21 11:45:56 +02:00
committed by Ulf Hansson
parent 7b2a6d518d
commit cdea194721
2 changed files with 10 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
drivers/mmc/host/mmci.c
View File

@@ -496,6 +496,9 @@ static void mmci_dma_unmap(struct mmci_host *host, struct mmc_data *data)
static void mmci_dma_data_error(struct mmci_host *host) static void mmci_dma_data_error(struct mmci_host *host)
{ {
if (!dma_inprogress(host))
return;
dev_err(mmc_dev(host->mmc), "error during DMA transfer!\n"); dev_err(mmc_dev(host->mmc), "error during DMA transfer!\n");
dmaengine_terminate_all(host->dma_current); dmaengine_terminate_all(host->dma_current);
host->dma_in_progress = false; host->dma_in_progress = false;
@@ -511,6 +514,9 @@ static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
u32 status; u32 status;
int i; int i;
if (!dma_inprogress(host))
return;
/* Wait up to 1ms for the DMA to complete */ /* Wait up to 1ms for the DMA to complete */
for (i = 0; ; i++) { for (i = 0; ; i++) {
status = readl(host->base + MMCISTATUS); status = readl(host->base + MMCISTATUS);
@@ -902,7 +908,6 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
u32 remain, success; u32 remain, success;
/* Terminate the DMA transfer */ /* Terminate the DMA transfer */
if (dma_inprogress(host))
mmci_dma_data_error(host); mmci_dma_data_error(host);
/* /*
@@ -941,8 +946,8 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n"); dev_err(mmc_dev(host->mmc), "stray MCI_DATABLOCKEND interrupt\n");
if (status & MCI_DATAEND || data->error) { if (status & MCI_DATAEND || data->error) {
if (dma_inprogress(host))
mmci_dma_finalize(host, data); mmci_dma_finalize(host, data);
mmci_stop_data(host); mmci_stop_data(host);
if (!data->error) if (!data->error)
@@ -1049,7 +1054,6 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
if ((!sbc && !cmd->data) || cmd->error) { if ((!sbc && !cmd->data) || cmd->error) {
if (host->data) { if (host->data) {
/* Terminate the DMA transfer */ /* Terminate the DMA transfer */
if (dma_inprogress(host))
mmci_dma_data_error(host); mmci_dma_data_error(host);
mmci_stop_data(host); mmci_stop_data(host);

2
drivers/mmc/host/mmci.h
View File

@@ -333,8 +333,6 @@ struct mmci_host {
bool dma_in_progress; bool dma_in_progress;
#define dma_inprogress(host) ((host)->dma_in_progress) #define dma_inprogress(host) ((host)->dma_in_progress)
#else
#define dma_inprogress(host) (0)
#endif #endif
}; };