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 V2 21/27] mmc: mmci: add variant property to write datactrl before command
Date: Fri, 21 Sep 2018 11:46:15 +0200 [thread overview]
Message-ID: <1537523181-14578-22-git-send-email-ludovic.Barre@st.com> (raw)
In-Reply-To: <1537523181-14578-1-git-send-email-ludovic.Barre@st.com>
From: Ludovic Barre <ludovic.barre@st.com>
This patch adds a boolean property to allow to write datactrl
before to send command, whatever the command type (read or write).
Needed to support the STM32 sdmmc variant.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 6 ++++--
drivers/mmc/host/mmci.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f61b10b..b525ba4 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1239,7 +1239,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
mmci_request_end(host, host->mrq);
} else if (sbc) {
mmci_start_command(host, host->mrq->cmd, 0);
- } else if (!(cmd->data->flags & MMC_DATA_READ)) {
+ } else if (!host->variant->datactrl_first &&
+ !(cmd->data->flags & MMC_DATA_READ)) {
mmci_start_data(host, cmd->data);
}
}
@@ -1503,7 +1504,8 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
if (mrq->data)
mmci_get_next_data(host, mrq->data);
- if (mrq->data && mrq->data->flags & MMC_DATA_READ)
+ if (mrq->data &&
+ (host->variant->datactrl_first || mrq->data->flags & MMC_DATA_READ))
mmci_start_data(host, mrq->data);
if (mrq->sbc)
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index cd72c2e..93e879b 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -223,6 +223,7 @@ struct mmci_host;
* @datactrl_mask_sdio: SDIO enable mask in datactrl register
* @datactrl_blksz: block size in power of two
* @datactrl_dpsm_enable: enable value for DPSM
+ * @datactrl_first: true if data must be setup before send command
* @pwrreg_powerup: power up value for MMCIPOWER register
* @f_max: maximum clk frequency supported by the controller.
* @signal_direction: input/out direction of bus signals can be indicated
@@ -262,6 +263,7 @@ struct variant_data {
unsigned int datactrl_mask_sdio;
unsigned int datactrl_blocksz;
unsigned int datactrl_dpsm_enable;
+ bool datactrl_first;
bool st_sdio;
bool st_clkdiv;
bool blksz_datactrl16;
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
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 V2 21/27] mmc: mmci: add variant property to write datactrl before command
Date: Fri, 21 Sep 2018 11:46:15 +0200 [thread overview]
Message-ID: <1537523181-14578-22-git-send-email-ludovic.Barre@st.com> (raw)
In-Reply-To: <1537523181-14578-1-git-send-email-ludovic.Barre@st.com>
From: Ludovic Barre <ludovic.barre@st.com>
This patch adds a boolean property to allow to write datactrl
before to send command, whatever the command type (read or write).
Needed to support the STM32 sdmmc variant.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 6 ++++--
drivers/mmc/host/mmci.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f61b10b..b525ba4 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1239,7 +1239,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
mmci_request_end(host, host->mrq);
} else if (sbc) {
mmci_start_command(host, host->mrq->cmd, 0);
- } else if (!(cmd->data->flags & MMC_DATA_READ)) {
+ } else if (!host->variant->datactrl_first &&
+ !(cmd->data->flags & MMC_DATA_READ)) {
mmci_start_data(host, cmd->data);
}
}
@@ -1503,7 +1504,8 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
if (mrq->data)
mmci_get_next_data(host, mrq->data);
- if (mrq->data && mrq->data->flags & MMC_DATA_READ)
+ if (mrq->data &&
+ (host->variant->datactrl_first || mrq->data->flags & MMC_DATA_READ))
mmci_start_data(host, mrq->data);
if (mrq->sbc)
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index cd72c2e..93e879b 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -223,6 +223,7 @@ struct mmci_host;
* @datactrl_mask_sdio: SDIO enable mask in datactrl register
* @datactrl_blksz: block size in power of two
* @datactrl_dpsm_enable: enable value for DPSM
+ * @datactrl_first: true if data must be setup before send command
* @pwrreg_powerup: power up value for MMCIPOWER register
* @f_max: maximum clk frequency supported by the controller.
* @signal_direction: input/out direction of bus signals can be indicated
@@ -262,6 +263,7 @@ struct variant_data {
unsigned int datactrl_mask_sdio;
unsigned int datactrl_blocksz;
unsigned int datactrl_dpsm_enable;
+ bool datactrl_first;
bool st_sdio;
bool st_clkdiv;
bool blksz_datactrl16;
--
2.7.4
WARNING: multiple messages have this Message-ID (diff)
From: ludovic.Barre@st.com (Ludovic Barre)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH V2 21/27] mmc: mmci: add variant property to write datactrl before command
Date: Fri, 21 Sep 2018 11:46:15 +0200 [thread overview]
Message-ID: <1537523181-14578-22-git-send-email-ludovic.Barre@st.com> (raw)
In-Reply-To: <1537523181-14578-1-git-send-email-ludovic.Barre@st.com>
From: Ludovic Barre <ludovic.barre@st.com>
This patch adds a boolean property to allow to write datactrl
before to send command, whatever the command type (read or write).
Needed to support the STM32 sdmmc variant.
Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
---
drivers/mmc/host/mmci.c | 6 ++++--
drivers/mmc/host/mmci.h | 2 ++
2 files changed, 6 insertions(+), 2 deletions(-)
diff --git a/drivers/mmc/host/mmci.c b/drivers/mmc/host/mmci.c
index f61b10b..b525ba4 100644
--- a/drivers/mmc/host/mmci.c
+++ b/drivers/mmc/host/mmci.c
@@ -1239,7 +1239,8 @@ mmci_cmd_irq(struct mmci_host *host, struct mmc_command *cmd,
mmci_request_end(host, host->mrq);
} else if (sbc) {
mmci_start_command(host, host->mrq->cmd, 0);
- } else if (!(cmd->data->flags & MMC_DATA_READ)) {
+ } else if (!host->variant->datactrl_first &&
+ !(cmd->data->flags & MMC_DATA_READ)) {
mmci_start_data(host, cmd->data);
}
}
@@ -1503,7 +1504,8 @@ static void mmci_request(struct mmc_host *mmc, struct mmc_request *mrq)
if (mrq->data)
mmci_get_next_data(host, mrq->data);
- if (mrq->data && mrq->data->flags & MMC_DATA_READ)
+ if (mrq->data &&
+ (host->variant->datactrl_first || mrq->data->flags & MMC_DATA_READ))
mmci_start_data(host, mrq->data);
if (mrq->sbc)
diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
index cd72c2e..93e879b 100644
--- a/drivers/mmc/host/mmci.h
+++ b/drivers/mmc/host/mmci.h
@@ -223,6 +223,7 @@ struct mmci_host;
* @datactrl_mask_sdio: SDIO enable mask in datactrl register
* @datactrl_blksz: block size in power of two
* @datactrl_dpsm_enable: enable value for DPSM
+ * @datactrl_first: true if data must be setup before send command
* @pwrreg_powerup: power up value for MMCIPOWER register
* @f_max: maximum clk frequency supported by the controller.
* @signal_direction: input/out direction of bus signals can be indicated
@@ -262,6 +263,7 @@ struct variant_data {
unsigned int datactrl_mask_sdio;
unsigned int datactrl_blocksz;
unsigned int datactrl_dpsm_enable;
+ bool datactrl_first;
bool st_sdio;
bool st_clkdiv;
bool blksz_datactrl16;
--
2.7.4
next prev parent reply other threads:[~2018-09-21 9:48 UTC|newest]
Thread overview: 136+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-09-21 9:45 [PATCH V2 00/27] mmc: mmci: add sdmmc variant for stm32 Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` [PATCH V2 01/27] mmc: mmci: internalize dma map/unmap into mmci dma functions Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-26 23:49 ` Ulf Hansson
2018-09-26 23:49 ` Ulf Hansson
2018-09-21 9:45 ` [PATCH V2 02/27] mmc: mmci: internalize dma_inprogress " Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-26 23:49 ` Ulf Hansson
2018-09-26 23:49 ` Ulf Hansson
2018-09-21 9:45 ` [PATCH V2 03/27] mmc: mmci: convert dma_setup callback to return an int Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-24 14:28 ` Ulf Hansson
2018-09-24 14:28 ` Ulf Hansson
2018-09-24 16:12 ` Ludovic BARRE
2018-09-24 16:12 ` Ludovic BARRE
2018-09-24 16:12 ` Ludovic BARRE
2018-09-26 23:49 ` Ulf Hansson
2018-09-26 23:49 ` Ulf Hansson
2018-09-27 8:55 ` Srinivas Kandagatla
2018-09-27 8:55 ` Srinivas Kandagatla
2018-09-21 9:45 ` [PATCH V2 04/27] mmc: mmci: introduce dma_priv pointer to mmci_host Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-24 18:52 ` Ulf Hansson
2018-09-24 18:52 ` Ulf Hansson
2018-09-25 7:19 ` Ludovic BARRE
2018-09-25 7:19 ` Ludovic BARRE
2018-09-25 7:19 ` Ludovic BARRE
2018-09-21 9:45 ` [PATCH V2 05/27] mmc: mmci: move mmci next cookie to mci host Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-21 9:45 ` Ludovic Barre
2018-09-24 18:46 ` Ulf Hansson
2018-09-24 18:46 ` Ulf Hansson
2018-09-25 7:08 ` Ludovic BARRE
2018-09-25 7:08 ` Ludovic BARRE
2018-09-25 7:08 ` Ludovic BARRE
2018-09-21 9:46 ` [PATCH V2 06/27] mmc: mmci: merge prepare data functions Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 07/27] mmc: mmci: add prepare/unprepare_data callbacks Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 08/27] mmc: mmci: add get_next_data callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 09/27] mmc: mmci: modify dma_setup callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 9:43 ` Ludovic BARRE
2018-10-01 9:43 ` Ludovic BARRE
2018-10-01 9:43 ` Ludovic BARRE
2018-09-21 9:46 ` [PATCH V2 10/27] mmc: mmci: add dma_release callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 11/27] mmc: mmci: add dma_start callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 12/27] mmc: mmci: add dma_finalize callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 13/27] mmc: mmci: add dma_error callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 14/27] mmc: mmci: add validate_data callback Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 15/27] mmc: mmci: add set_clk/pwrreg callbacks Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 16/27] mmc: mmci: add datactrl block size variant property Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 17/27] mmc: mmci: expand startbiterr to irqmask and error check Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 18/27] mmc: mmci: add variant properties to define cpsm & cmdresp bits Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 19/27] mmc: mmci: add variant property to define dpsm bit Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 20/27] mmc: mmci: add variant property to define irq pio mask Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre [this message]
2018-09-21 9:46 ` [PATCH V2 21/27] mmc: mmci: add variant property to write datactrl before command Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 22/27] mmc: mmci: add variant property to not read datacnt Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 23/27] mmc: mmci: add variant property to request a reset Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 12:16 ` Ludovic BARRE
2018-10-01 12:16 ` Ludovic BARRE
2018-10-01 12:16 ` Ludovic BARRE
2018-10-01 13:43 ` Ulf Hansson
2018-10-01 13:43 ` Ulf Hansson
2018-09-21 9:46 ` [PATCH V2 24/27] mmc: mmci: add clock divider for stm32 sdmmc Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 25/27] mmc: mmci: add stm32 sdmmc registers Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` [PATCH V2 26/27] mmc: mmci: add DT bindings for STM32 sdmmc Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-25 15:27 ` Rob Herring
2018-09-25 15:27 ` Rob Herring
2018-10-01 9:30 ` Ulf Hansson
2018-10-01 9:30 ` Ulf Hansson
2018-09-21 9:46 ` [PATCH V2 27/27] mmc: mmci: add stm32 sdmmc variant Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-09-21 9:46 ` Ludovic Barre
2018-10-01 9:31 ` Ulf Hansson
2018-10-01 9:31 ` Ulf Hansson
2018-10-01 12:56 ` Ludovic BARRE
2018-10-01 12:56 ` Ludovic BARRE
2018-10-01 12:56 ` Ludovic BARRE
2018-10-01 13:39 ` Ulf Hansson
2018-10-01 13:39 ` Ulf Hansson
2018-10-01 13:53 ` Ludovic BARRE
2018-10-01 13:53 ` Ludovic BARRE
2018-10-01 13:53 ` Ludovic BARRE
-- strict thread matches above, loose matches on Subject: below --
2018-09-18 10:55 [PATCH V2 00/27] mmc: mmci: add sdmmc variant for stm32 Ludovic Barre
2018-09-18 10:55 ` [PATCH V2 21/27] mmc: mmci: add variant property to write datactrl before command Ludovic Barre
2018-09-18 10:55 ` Ludovic Barre
2018-09-18 10:55 ` 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=1537523181-14578-22-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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.