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 09/14] mmc: mmci: modify dma_setup callback
Date: Wed, 1 Aug 2018 11:36:56 +0200 [thread overview]
Message-ID: <1533116221-380-10-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 creates a generic mmci_dma_setup which calls
dma_setup callback and manages common next_cookie.
This patch is needed for sdmmc variant which has a different
dma settings.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 25 +++++++++++++------------
drivers/mmc/host/mmci.h | 1 +
drivers/mmc/host/mmci_qcom_dml.c | 2 ++
3 files changed, 16 insertions(+), 12 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 0193da6..ae47d08 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -398,6 +398,17 @@ void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
host->ops->get_next_data(host, data);
}
+int mmci_dma_setup(struct mmci_host *host)
+{
+ if (!host->ops || !host->ops->dma_setup)
+ return 0;
+
+ /* initialize pre request cookie */
+ host->next_cookie = 1;
+
+ return host->ops->dma_setup(host);
+}
+
static void
mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
{
@@ -472,7 +483,7 @@ struct dmaengine_priv {
#define __dmae_inprogress(dmae) ((dmae)->dma_in_progress)
-static int mmci_dma_setup(struct mmci_host *host)
+int mmci_dmae_setup(struct mmci_host *host)
{
const char *rxname, *txname;
struct dmaengine_priv *dmae;
@@ -488,9 +499,6 @@ static int mmci_dma_setup(struct mmci_host *host)
dmae->dma_tx_channel = dma_request_slave_channel(mmc_dev(host->mmc),
"tx");
- /* initialize pre request cookie */
- host->next_cookie = 1;
-
/*
* If only an RX channel is specified, the driver will
* attempt to use it bidirectionally, however if it is
@@ -531,9 +539,6 @@ static int mmci_dma_setup(struct mmci_host *host)
host->mmc->max_seg_size = max_seg_size;
}
- if (host->ops && host->ops->dma_setup)
- return host->ops->dma_setup(host);
-
return 0;
}
@@ -793,14 +798,10 @@ static struct mmci_host_ops mmci_variant_ops = {
.prepare_data = mmci_dmae_prepare_data,
.unprepare_data = mmci_dmae_unprepare_data,
.get_next_data = mmci_dmae_get_next_data,
+ .dma_setup = mmci_dmae_setup,
};
#else
/* Blank functions if the DMA engine is not available */
-static inline int mmci_dma_setup(struct mmci_host *host)
-{
- return 0;
-}
-
static inline void mmci_dma_release(struct mmci_host *host)
{
}
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index bb1e4ba..e1b389c 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -335,3 +335,4 @@ int mmci_dmae_prepare_data(struct mmci_host *host, struct mmc_data *data,
void mmci_dmae_unprepare_data(struct mmci_host *host,
struct mmc_data *data, int err);
void mmci_dmae_get_next_data(struct mmci_host *host, struct mmc_data *data);
+int mmci_dmae_setup(struct mmci_host *host);
diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index e4c505a..47abbdd 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -126,6 +126,8 @@ static int qcom_dma_setup(struct mmci_host *host)
int consumer_id, producer_id;
struct device_node *np = host->mmc->parent->of_node;
+ mmci_dmae_setup(host);
+
consumer_id = of_get_dml_pipe_index(np, "tx");
producer_id = of_get_dml_pipe_index(np, "rx");
--
2.7.4
next prev parent reply other threads:[~2018-08-01 9:36 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 ` Ludovic Barre [this message]
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 ` [PATCH 13/14] mmc: mmci: add dma_error callback Ludovic Barre
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-10-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).