iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

mmc: mmci: internalize dma map/unmap into mmci dma functions

Browse Source 
This patch internalizes the management of dma map/unmap into
mmci dma interfaces. This allows to simplify and prepare the next dma
callbacks for mmci host ops.
mmci_dma_unmap was called in mmci_data_irq & mmci_cmd_irq functions
and can be integrated in mmci_dma_data_error.

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:55 +02:00 committed by Ulf Hansson
parent 2ffca7a34d
commit 7b2a6d518d
1 changed files with 17 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -481,16 +481,6 @@ static inline void mmci_dma_release(struct mmci_host *host)
host->dma_rx_channel = host->dma_tx_channel = NULL; host->dma_rx_channel = host->dma_tx_channel = NULL;
} }
static void mmci_dma_data_error(struct mmci_host *host)
{
dev_err(mmc_dev(host->mmc), "error during DMA transfer!\n");
dmaengine_terminate_all(host->dma_current);
host->dma_in_progress = false;
host->dma_current = NULL;
host->dma_desc_current = NULL;
host->data->host_cookie = 0;
}
static void mmci_dma_unmap(struct mmci_host *host, struct mmc_data *data) static void mmci_dma_unmap(struct mmci_host *host, struct mmc_data *data)
{ {
struct dma_chan *chan; struct dma_chan *chan;
@ -504,6 +494,18 @@ static void mmci_dma_unmap(struct mmci_host *host, struct mmc_data *data)
mmc_get_dma_dir(data)); mmc_get_dma_dir(data));
} }
static void mmci_dma_data_error(struct mmci_host *host)
{
dev_err(mmc_dev(host->mmc), "error during DMA transfer!\n");
dmaengine_terminate_all(host->dma_current);
host->dma_in_progress = false;
host->dma_current = NULL;
host->dma_desc_current = NULL;
host->data->host_cookie = 0;
mmci_dma_unmap(host, host->data);
}
static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data) static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
{ {
u32 status; u32 status;
@ -527,10 +529,9 @@ static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
mmci_dma_data_error(host); mmci_dma_data_error(host);
if (!data->error) if (!data->error)
data->error = -EIO; data->error = -EIO;
} } else if (!data->host_cookie) {
if (!data->host_cookie)
mmci_dma_unmap(host, data); mmci_dma_unmap(host, data);
}
/* /*
* Use of DMA with scatter-gather is impossible. * Use of DMA with scatter-gather is impossible.
@ -741,10 +742,6 @@ static inline void mmci_dma_release(struct mmci_host *host)
{ {
} }
static inline void mmci_dma_unmap(struct mmci_host *host, struct mmc_data *data)
{
}
static inline void mmci_dma_finalize(struct mmci_host *host, static inline void mmci_dma_finalize(struct mmci_host *host,
struct mmc_data *data) struct mmc_data *data)
{ {
@ -905,10 +902,8 @@ 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)) { if (dma_inprogress(host))
mmci_dma_data_error(host); mmci_dma_data_error(host);
mmci_dma_unmap(host, data);
}
/* /*
* Calculate how far we are into the transfer. Note that * Calculate how far we are into the transfer. Note that
@ -1054,10 +1049,9 @@ 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)) { if (dma_inprogress(host))
mmci_dma_data_error(host); mmci_dma_data_error(host);
mmci_dma_unmap(host, host->data);
}
mmci_stop_data(host); mmci_stop_data(host);
} }
mmci_request_end(host, host->mrq); mmci_request_end(host, host->mrq);