From: Ludovic Barre <ludovic.Barre@st.com>
To: Ulf Hansson <ulf.hansson@linaro.org>, Rob Herring <robh+dt@kernel.org>
Cc: Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Gerald Baeza <gerald.baeza@st.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org, Ludovic Barre <ludovic.barre@st.com>
Subject: [PATCH 13/14] mmc: mmci: add dma_error callback
Date: Wed, 1 Aug 2018 11:37:00 +0200 [thread overview]
Message-ID: <1533116221-380-14-git-send-email-ludovic.Barre@st.com> (raw)
In-Reply-To: <1533116221-380-1-git-send-email-ludovic.Barre@st.com>
From: Ludovic Barre <ludovic.barre@st.com>
This patch adds dma_error callback at mmci_host_ops
to allow to call specific variant.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 20 +++++++++++---------
drivers/mmc/host/mmci.h | 2 ++
drivers/mmc/host/mmci_qcom_dml.c | 1 +
3 files changed, 14 insertions(+), 9 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index b124a73..d5ca93e 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -453,6 +453,12 @@ void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
host->ops->dma_finalize(host, data);
}
+void mmci_dma_error(struct mmci_host *host)
+{
+ if (host->ops && host->ops->dma_error)
+ host->ops->dma_error(host);
+}
+
static void
mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
{
@@ -615,7 +621,7 @@ static void __mmci_dmae_unmap(struct mmci_host *host, struct mmc_data *data)
mmc_get_dma_dir(data));
}
-static void mmci_dma_data_error(struct mmci_host *host)
+void mmci_dmae_error(struct mmci_host *host)
{
struct dmaengine_priv *dmae = host->dma_priv;
@@ -656,7 +662,7 @@ void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data)
* contiguous buffers. On TX, we'll get a FIFO underrun error.
*/
if (status & MCI_RXDATAAVLBLMASK) {
- mmci_dma_data_error(host);
+ mmci_dma_error(host);
if (!data->error)
data->error = -EIO;
} else if (!data->host_cookie) {
@@ -827,13 +833,9 @@ static struct mmci_host_ops mmci_variant_ops = {
.dma_release = mmci_dmae_release,
.dma_start = mmci_dmae_start,
.dma_finalize = mmci_dmae_finalize,
+ .dma_error = mmci_dmae_error,
};
#else
-/* Blank functions if the DMA engine is not available */
-static inline void mmci_dma_data_error(struct mmci_host *host)
-{
-}
-
static struct mmci_host_ops mmci_variant_ops = {};
#endif
@@ -1011,7 +1013,7 @@ mmci_data_irq(struct mmci_host *host, struct mmc_data *data,
u32 remain, success;
/* Terminate the DMA transfer */
- mmci_dma_data_error(host);
+ mmci_dma_error(host);
/*
* Calculate how far we are into the transfer. Note that
@@ -1157,7 +1159,7 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
if ((!sbc && !cmd->data) || cmd->error) {
if (host->data) {
/* Terminate the DMA transfer */
- mmci_dma_data_error(host);
+ mmci_dma_error(host);
mmci_stop_data(host);
}
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 3f482d5..0a4811d 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -282,6 +282,7 @@ struct mmci_host_ops {
void (*dma_release)(struct mmci_host *host);
int (*dma_start)(struct mmci_host *host, unsigned int *datactrl);
void (*dma_finalize)(struct mmci_host *host, struct mmc_data *data);
+ void (*dma_error)(struct mmci_host *host);
};
struct mmci_host {
@@ -342,3 +343,4 @@ int mmci_dmae_setup(struct mmci_host *host);
void mmci_dmae_release(struct mmci_host *host);
int mmci_dmae_start(struct mmci_host *host, unsigned int *datactrl);
void mmci_dmae_finalize(struct mmci_host *host, struct mmc_data *data);
+void mmci_dmae_error(struct mmci_host *host);
diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index ba7e311..80701b4 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -189,6 +189,7 @@ static struct mmci_host_ops qcom_variant_ops = {
.dma_release = mmci_dmae_release,
.dma_start = mmci_dmae_start,
.dma_finalize = mmci_dmae_finalize,
+ .dma_error = mmci_dmae_error,
};
void qcom_variant_init(struct mmci_host *host)
--
2.7.4
next prev parent reply other threads:[~2018-08-01 9:37 UTC|newest]
Thread overview: 25+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-01 9:36 [PATCH 00/14] mmc: mmci: prepare dma callbacks with mmci_host_ops Ludovic Barre
2018-08-01 9:36 ` [PATCH 01/14] mmc: mmci: fix qcom dma issue during mmci init with new dma_setup callback Ludovic Barre
2018-08-01 10:08 ` Ulf Hansson
2018-08-01 10:09 ` Ludovic BARRE
2018-08-01 9:36 ` [PATCH 02/14] mmc: mmci: internalize dma map/unmap into mmci dma functions Ludovic Barre
2018-09-03 12:14 ` Ulf Hansson
2018-08-01 9:36 ` [PATCH 03/14] mmc: mmci: internalize dma_inprogress " Ludovic Barre
2018-09-03 12:15 ` Ulf Hansson
2018-08-01 9:36 ` [PATCH 04/14] mmc: mmci: introduce dma_priv pointer to mmci_host Ludovic Barre
2018-09-03 12:15 ` Ulf Hansson
2018-08-01 9:36 ` [PATCH 05/14] mmc: mmci: move mmci next cookie to mci host Ludovic Barre
2018-08-01 9:36 ` [PATCH 06/14] mmc: mmci: merge prepare data functions Ludovic Barre
2018-09-03 12:15 ` Ulf Hansson
2018-08-01 9:36 ` [PATCH 07/14] mmc: mmci: add prepare/unprepare_data callbacks Ludovic Barre
2018-09-04 9:43 ` Ulf Hansson
2018-08-01 9:36 ` [PATCH 08/14] mmc: mmci: add get_next_data callback Ludovic Barre
2018-08-01 9:36 ` [PATCH 09/14] mmc: mmci: modify dma_setup callback Ludovic Barre
2018-08-01 9:36 ` [PATCH 10/14] mmc: mmci: add dma_release callback Ludovic Barre
2018-08-01 9:36 ` [PATCH 11/14] mmc: mmci: add dma_start callback Ludovic Barre
2018-08-01 9:36 ` [PATCH 12/14] mmc: mmci: add dma_finalize callback Ludovic Barre
2018-08-01 9:37 ` Ludovic Barre [this message]
2018-08-01 9:37 ` [PATCH 14/14] mmc: mmci: add validate_data callback Ludovic Barre
2018-09-04 10:00 ` [PATCH 00/14] mmc: mmci: prepare dma callbacks with mmci_host_ops Ulf Hansson
2018-09-05 9:13 ` Ludovic BARRE
2018-09-05 10:43 ` Ulf Hansson
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1533116221-380-14-git-send-email-ludovic.Barre@st.com \
--to=ludovic.barre@st.com \
--cc=alexandre.torgue@st.com \
--cc=devicetree@vger.kernel.org \
--cc=gerald.baeza@st.com \
--cc=linux-arm-kernel@lists.infradead.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh+dt@kernel.org \
--cc=ulf.hansson@linaro.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).