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>,
benjamin.gaignard@linaro.org, Gerald Baeza <gerald.baeza@st.com>,
Loic Pallardy <loic.pallardy@st.com>,
linux-arm-kernel@lists.infradead.org,
linux-kernel@vger.kernel.org, devicetree@vger.kernel.org,
linux-mmc@vger.kernel.org,
linux-stm32@st-md-mailman.stormreply.com,
Ludovic Barre <ludovic.barre@st.com>
Subject: [PATCH V4 06/25] mmc: mmci: add get_next_data callback
Date: Tue, 2 Oct 2018 14:09:08 +0200 [thread overview]
Message-ID: <1538482167-13819-7-git-send-email-ludovic.Barre@st.com> (raw)
In-Reply-To: <1538482167-13819-1-git-send-email-ludovic.Barre@st.com>
From: Ludovic Barre <ludovic.barre@st.com>
This patch adds get_next_data callback to mmci_host_ops.
Generic mmci_get_next_data factorizes next_cookie check and
the host ops call.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 16 ++++++++++------
drivers/mmc/host/mmci.h | 2 ++
drivers/mmc/host/mmci_qcom_dml.c | 1 +
3 files changed, 13 insertions(+), 6 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index 7f66724..9236d4f 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -403,6 +403,14 @@ void mmci_unprep_data(struct mmci_host *host, struct mmc_data *data,
data->host_cookie = 0;
}
+void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
+{
+ WARN_ON(data->host_cookie && data->host_cookie != host->next_cookie);
+
+ if (host->ops && host->ops->get_next_data)
+ host->ops->get_next_data(host, data);
+}
+
static void
mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
{
@@ -756,7 +764,7 @@ static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl)
return 0;
}
-static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
+void mmci_dmae_get_next_data(struct mmci_host *host, struct mmc_data *data)
{
struct mmci_dmae_priv *dmae = host->dma_priv;
struct mmci_dmae_next *next = &dmae->next_data;
@@ -764,7 +772,6 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
if (!host->use_dma)
return;
- WARN_ON(data->host_cookie && data->host_cookie != host->next_cookie);
WARN_ON(!data->host_cookie && (next->desc || next->chan));
dmae->desc_current = next->desc;
@@ -809,14 +816,11 @@ void mmci_dmae_unprep_data(struct mmci_host *host,
static struct mmci_host_ops mmci_variant_ops = {
.prep_data = mmci_dmae_prep_data,
.unprep_data = mmci_dmae_unprep_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 void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
-{
-}
-
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 e43be60..8d65d55 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -277,6 +277,7 @@ struct mmci_host_ops {
bool next);
void (*unprep_data)(struct mmci_host *host, struct mmc_data *data,
int err);
+ void (*get_next_data)(struct mmci_host *host, struct mmc_data *data);
int (*dma_setup)(struct mmci_host *host);
};
@@ -336,5 +337,6 @@ int mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data,
bool next);
void mmci_dmae_unprep_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 9f60ac0..16ae40e 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -185,6 +185,7 @@ static int qcom_dma_setup(struct mmci_host *host)
static struct mmci_host_ops qcom_variant_ops = {
.prep_data = mmci_dmae_prep_data,
.unprep_data = mmci_dmae_unprep_data,
+ .get_next_data = mmci_dmae_get_next_data,
.dma_setup = qcom_dma_setup,
};
--
2.7.4
next prev parent reply other threads:[~2018-10-02 12:09 UTC|newest]
Thread overview: 28+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-10-02 12:09 [PATCH V4 00/25] mmc: mmci: add sdmmc variant for stm32 Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 01/25] mmc: mmci: Change struct members from bool to u8 Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 02/25] mmc: mmci: create generic mmci_dma_setup Ludovic Barre
2018-10-03 9:22 ` Ulf Hansson
2018-10-03 11:44 ` Ludovic BARRE
2018-10-02 12:09 ` [PATCH V4 03/25] mmc: mmci: introduce dma_priv pointer to mmci_host Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 04/25] mmc: mmci: merge prepare data functions Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 05/25] mmc: mmci: add prepare/unprepare_data callbacks Ludovic Barre
2018-10-02 12:09 ` Ludovic Barre [this message]
2018-10-02 12:09 ` [PATCH V4 07/25] mmc: mmci: add dma_release callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 08/25] mmc: mmci: add dma_start callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 09/25] mmc: mmci: add dma_finalize callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 10/25] mmc: mmci: add dma_error callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 11/25] mmc: mmci: add validate_data callback Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 12/25] mmc: mmci: add set_clk/pwrreg callbacks Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 13/25] mmc: mmci: add datactrl block size variant property Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 14/25] mmc: mmci: expand startbiterr to irqmask and error check Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 15/25] mmc: mmci: add variant properties to define cpsm & cmdresp bits Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 16/25] mmc: mmci: add variant property to define dpsm bit Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 17/25] mmc: mmci: add variant property to define irq pio mask Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 18/25] mmc: mmci: add variant property to write datactrl before command Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 19/25] mmc: mmci: add variant property to not read datacnt Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 20/25] dt-bindings: mmci: add optional reset property Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 21/25] mmc: " Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 22/25] mmc: mmci: add clock divider for stm32 sdmmc Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 23/25] mmc: mmci: add stm32 sdmmc registers Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 24/25] dt-bindings: mmci: add stm32 sdmmc variant Ludovic Barre
2018-10-02 12:09 ` [PATCH V4 25/25] mmc: " Ludovic Barre
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=1538482167-13819-7-git-send-email-ludovic.Barre@st.com \
--to=ludovic.barre@st.com \
--cc=alexandre.torgue@st.com \
--cc=benjamin.gaignard@linaro.org \
--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=linux-stm32@st-md-mailman.stormreply.com \
--cc=loic.pallardy@st.com \
--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).