From: Ludovic Barre <ludovic.barre@xxxxxx>
This patch adds prepare/unprepare callbacks to mmci_host_ops.
Like this mmci_pre/post_request can be generic, mmci_prepare_data
and mmci_unprepare_data provide common next_cookie management.
Signed-off-by: Ludovic Barre <ludovic.barre@xxxxxx>
---
drivers/mmc/host/mmci.c | 101 ++++++++++++++++++++++++++-------------
drivers/mmc/host/mmci.h | 8 ++++
drivers/mmc/host/mmci_qcom_dml.c | 2 +
3 files changed, 78 insertions(+), 33 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f862a1b..4db2b3f 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -392,6 +392,31 @@ void mmci_dma_setup(struct mmci_host *host)
host->use_dma = true;
}
+int mmci_prep_data(struct mmci_host *host, struct mmc_data *data, bool next)
+{
+ int err;
+
+ if (!host->ops || !host->ops->prep_data)
+ return 0;
+
+ err = host->ops->prep_data(host, data, next);
+
+ if (next && !err)
+ data->host_cookie = ++host->next_cookie < 0 ?
+ 1 : host->next_cookie;
+
+ return err;
+}
+
+void mmci_unprep_data(struct mmci_host *host, struct mmc_data *data,
+ int err)
+{
+ if (host->ops && host->ops->unprep_data)
+ host->ops->unprep_data(host, data, err);
+
+ data->host_cookie = 0;
+}
+
static void
mmci_request_end(struct mmci_host *host, struct mmc_request *mrq)
{
@@ -619,7 +644,7 @@ static void mmci_dma_finalize(struct mmci_host *host, struct mmc_data *data)
}
/* prepares DMA channel and DMA descriptor, returns non-zero on failure */
-static int __mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
+static int _mmci_dmae_prep_data(struct mmci_host *host, struct mmc_data *data,
struct dma_chan **dma_chan,
struct dma_async_tx_descriptor **dma_desc)
{
@@ -682,21 +707,24 @@ static int __mmci_dma_prep_data(struct mmci_host *host, struct mmc_data *data,
return -ENOMEM;
}
-static inline int mmci_dma_prep_data(struct mmci_host *host,
- struct mmc_data *data,
- bool next)
+int mmci_dmae_prep_data(struct mmci_host *host,
+ struct mmc_data *data,
+ bool next)
{
struct mmci_dmae_priv *dmae = host->dma_priv;
struct mmci_dmae_next *nd = &dmae->next_data;
+ if (!host->use_dma)
+ return -EINVAL;
+
if (next)
- return __mmci_dma_prep_data(host, data, &nd->chan, &nd->desc);
+ return _mmci_dmae_prep_data(host, data, &nd->chan, &nd->desc);
/* Check if next job is already prepared. */
if (dmae->cur && dmae->desc_current)
return 0;
/* No job were prepared thus do it now. */
- return __mmci_dma_prep_data(host, data, &dmae->cur,
+ return _mmci_dmae_prep_data(host, data, &dmae->cur,
&dmae->desc_current);
}
@@ -709,7 +737,7 @@ static int mmci_dma_start_data(struct mmci_host *host, unsigned int datactrl)
if (!host->use_dma)
return -EINVAL;
- ret = mmci_dma_prep_data(host, host->data, false);
+ ret = mmci_dmae_prep_data(host, host->data, false);
if (ret)
return ret;
@@ -756,32 +784,13 @@ static void mmci_get_next_data(struct mmci_host *host, struct mmc_data *data)
next->chan = NULL;
}
-static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)
-{
- struct mmci_host *host = mmc_priv(mmc);
- struct mmc_data *data = mrq->data;
-
- if (!host->use_dma || !data)
- return;
-
- BUG_ON(data->host_cookie);
-
- if (mmci_validate_data(host, data))
- return;
-
- if (!mmci_dma_prep_data(host, data, true))
- data->host_cookie = ++host->next_cookie < 0 ?
- 1 : host->next_cookie;
-}
+void mmci_dmae_unprep_data(struct mmci_host *host,
+ struct mmc_data *data, int err)
-static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq,
- int err)
{
- struct mmci_host *host = mmc_priv(mmc);
struct mmci_dmae_priv *dmae = host->dma_priv;
- struct mmc_data *data = mrq->data;
- if (!host->use_dma || !data || !data->host_cookie)
+ if (!host->use_dma)
return;
mmci_dma_unmap(host, data);
@@ -805,11 +814,12 @@ static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq,
next->desc = NULL;
next->chan = NULL;
- data->host_cookie = 0;
}
}
static struct mmci_host_ops mmci_variant_ops = {
+ .prep_data = mmci_dmae_prep_data,
+ .unprep_data = mmci_dmae_unprep_data,
.dma_setup = mmci_dmae_setup,
.dma_release = mmci_dmae_release,
};
@@ -838,11 +848,36 @@ static inline int mmci_dma_start_data(struct mmci_host *host, unsigned int datac
return -ENOSYS;
}
-#define mmci_pre_request NULL
-#define mmci_post_request NULL
-
#endif
+static void mmci_pre_request(struct mmc_host *mmc, struct mmc_request *mrq)
+{
+ struct mmci_host *host = mmc_priv(mmc);
+ struct mmc_data *data = mrq->data;
+
+ if (!data)
+ return;
+
+ WARN_ON(data->host_cookie);
+
+ if (mmci_validate_data(host, data))
+ return;
+
+ mmci_prep_data(host, data, true);
+}
+
+static void mmci_post_request(struct mmc_host *mmc, struct mmc_request *mrq,
+ int err)
+{
+ struct mmci_host *host = mmc_priv(mmc);
+ struct mmc_data *data = mrq->data;
+
+ if (!data || !data->host_cookie)
+ return;
+
+ mmci_unprep_data(host, data, err);
+}
+
static void mmci_start_data(struct mmci_host *host, struct mmc_data *data)
{
struct variant_data *variant = host->variant;
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index 1d5ba4e..decb1c7 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -273,6 +273,10 @@ struct variant_data {
/* mmci variant callbacks */
struct mmci_host_ops {
+ int (*prep_data)(struct mmci_host *host, struct mmc_data *data,
+ bool next);
+ void (*unprep_data)(struct mmci_host *host, struct mmc_data *data,
+ int err);
int (*dma_setup)(struct mmci_host *host);
void (*dma_release)(struct mmci_host *host);
};
@@ -327,6 +331,10 @@ struct mmci_host {
#define dma_inprogress(host) ((host)->dma_in_progress)
+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);
int mmci_dmae_setup(struct mmci_host *host);
void mmci_dmae_release(struct mmci_host *host);
diff --git a/drivers/mmc/host/mmci_qcom_dml.c b/drivers/mmc/host/mmci_qcom_dml.c
index 92b03a3..156e30b 100644
--- a/drivers/mmc/host/mmci_qcom_dml.c
+++ b/drivers/mmc/host/mmci_qcom_dml.c
@@ -184,6 +184,8 @@ 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,
.dma_setup = qcom_dma_setup,
.dma_release = mmci_dmae_release,
};
--
2.7.4
