From: Ulf Hansson <ulf.hansson@linaro.org>
To: Ludovic Barre <ludovic.Barre@st.com>
Cc: Rob Herring <robh+dt@kernel.org>,
Srinivas Kandagatla <srinivas.kandagatla@linaro.org>,
Maxime Coquelin <mcoquelin.stm32@gmail.com>,
Alexandre Torgue <alexandre.torgue@st.com>,
Linux ARM <linux-arm-kernel@lists.infradead.org>,
Linux Kernel Mailing List <linux-kernel@vger.kernel.org>,
DTML <devicetree@vger.kernel.org>,
"linux-mmc@vger.kernel.org" <linux-mmc@vger.kernel.org>,
linux-stm32@st-md-mailman.stormreply.com
Subject: Re: [PATCH 4/5] mmc: mmci: stm32: define get_dctrl_cfg
Date: Wed, 6 Mar 2019 14:31:52 +0100 [thread overview]
Message-ID: <CAPDyKFr3PLOdozCmfE7Lin0FhzgLnN120RZmMwk=K8RzGvveow@mail.gmail.com> (raw)
In-Reply-To: <1551694625-6414-5-git-send-email-ludovic.Barre@st.com>
On Mon, 4 Mar 2019 at 11:17, Ludovic Barre <ludovic.Barre@st.com> wrote:
>
> From: Ludovic Barre <ludovic.barre@st.com>
>
> This patch defines get_dctrl_cfg callback for sdmmc variant.
> sdmmc variant has specific stm32 transfer modes.
> sdmmc data transfer mode selection could be:
> -Block data transfer ending on block count.
> -SDIO multibyte data transfer.
> -MMC Stream data transfer (not used).
> -Block data transfer ending with STOP_TRANSMISSION command.
>
> Signed-off-by: Ludovic Barre <ludovic.barre@st.com>
> ---
> drivers/mmc/host/mmci.h | 5 +++++
> drivers/mmc/host/mmci_stm32_sdmmc.c | 21 +++++++++++++++++++++
> 2 files changed, 26 insertions(+)
>
> diff --git a/drivers/mmc/host/mmci.h b/drivers/mmc/host/mmci.h
> index 6f28f71..eb5d99af 100644
> --- a/drivers/mmc/host/mmci.h
> +++ b/drivers/mmc/host/mmci.h
> @@ -131,6 +131,11 @@
> /* Control register extensions in the Qualcomm versions */
> #define MCI_DPSM_QCOM_DATA_PEND BIT(17)
> #define MCI_DPSM_QCOM_RX_DATA_PEND BIT(20)
> +/* Control register extensions in STM32 versions */
> +#define MCI_DPSM_STM32_MODE_BLOCK (0 << 2)
> +#define MCI_DPSM_STM32_MODE_SDIO (1 << 2)
> +#define MCI_DPSM_STM32_MODE_STREAM (2 << 2)
> +#define MCI_DPSM_STM32_MODE_BLOCK_STOP (3 << 2)
>
> #define MMCIDATACNT 0x030
> #define MMCISTATUS 0x034
> diff --git a/drivers/mmc/host/mmci_stm32_sdmmc.c b/drivers/mmc/host/mmci_stm32_sdmmc.c
> index cfbfc6f..e7bf744 100644
> --- a/drivers/mmc/host/mmci_stm32_sdmmc.c
> +++ b/drivers/mmc/host/mmci_stm32_sdmmc.c
> @@ -265,10 +265,31 @@ static void mmci_sdmmc_set_pwrreg(struct mmci_host *host, unsigned int pwr)
> }
> }
>
> +u32 sdmmc_get_dctrl_cfg(struct mmci_host *host)
> +{
> + struct variant_data *variant = host->variant;
> + int blksz_bits;
> + u32 datactrl;
> +
> + blksz_bits = ffs(host->data->blksz) - 1;
> + datactrl = variant->datactrl_dpsm_enable | blksz_bits << 4;
> +
> + if (host->mmc->card && mmc_card_sdio(host->mmc->card) &&
> + host->data->blocks == 1)
These settings are not limited to deal with the block size bits.
Don't get me wrong, it seems reasonable to include them, but the
generic code in mmci_start_data() also have code to cope with SDIO. I
think we should start by splitting that up into a couple of
helper/library functions, and make the legacy variant to use them.
This should probably be done as a preparation to your series, so you
can build on top of that.
Does it make sense? If not, please tell and I can try to provide some
patch to show you what I mean.
> + datactrl |= MCI_DPSM_STM32_MODE_SDIO;
> + else if (host->data->stop && !host->mrq->sbc)
> + datactrl |= MCI_DPSM_STM32_MODE_BLOCK_STOP;
> + else
> + datactrl |= MCI_DPSM_STM32_MODE_BLOCK;
> +
> + return datactrl;
> +}
> +
> static struct mmci_host_ops sdmmc_variant_ops = {
> .validate_data = sdmmc_idma_validate_data,
> .prep_data = sdmmc_idma_prep_data,
> .unprep_data = sdmmc_idma_unprep_data,
> + .get_datactrl_cfg = sdmmc_get_dctrl_cfg,
> .dma_setup = sdmmc_idma_setup,
> .dma_start = sdmmc_idma_start,
> .dma_finalize = sdmmc_idma_finalize,
> --
> 2.7.4
>
Kind regards
Uffe
next prev parent reply other threads:[~2019-03-06 13:32 UTC|newest]
Thread overview: 9+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-03-04 10:17 [PATCH 0/5] mmc: mmci: add get_datactrl_cfg callback Ludovic Barre
2019-03-04 10:17 ` [PATCH 1/5] " Ludovic Barre
2019-03-04 10:17 ` [PATCH 2/5] mmc: mmci: define get_dctrl_cfg for legacy variant Ludovic Barre
2019-03-04 10:17 ` [PATCH 3/5] mmc: mmci: qcom: define get_dctrl_cfg Ludovic Barre
2019-03-06 13:31 ` Ulf Hansson
2019-03-04 10:17 ` [PATCH 4/5] mmc: mmci: stm32: " Ludovic Barre
2019-03-06 13:31 ` Ulf Hansson [this message]
2019-03-06 17:01 ` Ludovic BARRE
2019-03-04 10:17 ` [PATCH 5/5] mmc: mmci: replace blksz_datactrlXX by get_datactrl_cfg callback 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='CAPDyKFr3PLOdozCmfE7Lin0FhzgLnN120RZmMwk=K8RzGvveow@mail.gmail.com' \
--to=ulf.hansson@linaro.org \
--cc=alexandre.torgue@st.com \
--cc=devicetree@vger.kernel.org \
--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=ludovic.Barre@st.com \
--cc=mcoquelin.stm32@gmail.com \
--cc=robh+dt@kernel.org \
--cc=srinivas.kandagatla@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).