From: Adrian Hunter <adrian.hunter@intel.com>
To: Chunyan Zhang <zhang.chunyan@linaro.org>,
Ulf Hansson <ulf.hansson@linaro.org>
Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org,
Orson Zhai <orsonzhai@gmail.com>,
Baolin Wang <baolin.wang@linaro.org>,
Billows Wu <billows.wu@unisoc.com>,
Jason Wu <jason.wu@unisoc.com>,
Chunyan Zhang <chunyan.zhang@unisoc.com>,
Chunyan Zhang <zhang.lyra@gmail.com>
Subject: Re: [PATCH V6 5/9] mmc: sdhci: Add 32-bit block count support for v4 mode
Date: Mon, 27 Aug 2018 10:07:37 +0300 [thread overview]
Message-ID: <f209e114-152c-65e0-4c24-53252818ab5d@intel.com> (raw)
In-Reply-To: <1535102428-20332-6-git-send-email-zhang.chunyan@linaro.org>
On 24/08/18 12:20, Chunyan Zhang wrote:
> Host Controller Version 4.10 re-defines SDMA System Address register
> as 32-bit Block Count for v4 mode, and SDMA uses ADMA System
> Address register (05Fh-058h) instead if v4 mode is enabled. Also
> when using 32-bit block count, 16-bit block count register need
> to be set to zero.
>
> Since using 32-bit Block Count would cause problems for auto-cmd23,
> it can be chosen via host->quirk2.
>
> Signed-off-by: Chunyan Zhang <zhang.chunyan@linaro.org>
> ---
> drivers/mmc/host/sdhci.c | 15 ++++++++++++++-
> drivers/mmc/host/sdhci.h | 3 +++
> 2 files changed, 17 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 38d083c..05f9fff 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -1073,7 +1073,20 @@ static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
> /* Set the DMA boundary value and block size */
> sdhci_writew(host, SDHCI_MAKE_BLKSZ(host->sdma_boundary, data->blksz),
> SDHCI_BLOCK_SIZE);
> - sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
> +
> + /*
> + * For Version 4.10 onwards, if v4 mode is enabled, 16-bit Block Count
> + * register need to be set to zero, 32-bit Block Count register would
> + * be selected.
> + */
> + if (host->version >= SDHCI_SPEC_410 && host->v4_mode &&
> + !(host->quirks2 & SDHCI_QUIRK2_BROKEN_32BIT_BLK_CNT)) {
Because 32-bit block count is problematic but also not essential, I would
prefer to do the quirk the other way around. i.e. SDHCI_QUIRK2_USE_32BIT_BLK_CNT
I would also add a comment to the definition of
SDHCI_QUIRK2_USE_32BIT_BLK_CNT, like:
32-bit block count may not support eMMC where upper bits of CMD23 are used
for other purposes. Consequently we support 16-bit block count by default.
Otherwise, SDHCI_QUIRK2_USE_32BIT_BLK_CNT can be selected to use 32-bit
block count.
> + if (sdhci_readw(host, SDHCI_BLOCK_COUNT))
> + sdhci_writew(host, 0, SDHCI_BLOCK_COUNT);
> + sdhci_writew(host, data->blocks, SDHCI_32BIT_BLK_CNT);
> + } else {
> + sdhci_writew(host, data->blocks, SDHCI_BLOCK_COUNT);
> + }
> }
>
> static inline bool sdhci_auto_cmd12(struct sdhci_host *host,
> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
> index f3b9ebc..0a1e25f 100644
> --- a/drivers/mmc/host/sdhci.h
> +++ b/drivers/mmc/host/sdhci.h
> @@ -28,6 +28,7 @@
>
> #define SDHCI_DMA_ADDRESS 0x00
> #define SDHCI_ARGUMENT2 SDHCI_DMA_ADDRESS
> +#define SDHCI_32BIT_BLK_CNT SDHCI_DMA_ADDRESS
>
> #define SDHCI_BLOCK_SIZE 0x04
> #define SDHCI_MAKE_BLKSZ(dma, blksz) (((dma & 0x7) << 12) | (blksz & 0xFFF))
> @@ -462,6 +463,8 @@ struct sdhci_host {
> * obtainable timeout.
> */
> #define SDHCI_QUIRK2_DISABLE_HW_TIMEOUT (1<<17)
> +/* Controller broken with using 32-bit block count in v4_mode */
> +#define SDHCI_QUIRK2_BROKEN_32BIT_BLK_CNT (1<<18)
>
> int irq; /* Device IRQ */
> void __iomem *ioaddr; /* Mapped address */
>
next prev parent reply other threads:[~2018-08-27 7:11 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2018-08-24 9:20 [PATCH V6 0/9] mmc: add support for sdhci 4.0 Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 1/9] mmc: sdhci: Add version V4 definition Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 2/9] mmc: sdhci: Add sd host v4 mode Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 3/9] mmc: sdhci: Change SDMA address register for " Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 4/9] mmc: sdhci: Add ADMA2 64-bit addressing support for V4 mode Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 5/9] mmc: sdhci: Add 32-bit block count support for v4 mode Chunyan Zhang
2018-08-27 7:07 ` Adrian Hunter [this message]
2018-08-27 7:52 ` Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 6/9] mmc: sdhci: Add Auto CMD Auto Select support Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 7/9] mmc: sdhci: SDMA may use Auto-CMD23 in v4 mode Chunyan Zhang
2018-08-24 9:20 ` [PATCH V6 8/9] mmc: sdhci-sprd: Add Spreadtrum's initial host controller Chunyan Zhang
2018-08-27 7:34 ` Adrian Hunter
2018-08-24 9:20 ` [PATCH V6 9/9] dt-bindings: sdhci-sprd: Add bindings for the sdhci-sprd controller Chunyan Zhang
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=f209e114-152c-65e0-4c24-53252818ab5d@intel.com \
--to=adrian.hunter@intel.com \
--cc=baolin.wang@linaro.org \
--cc=billows.wu@unisoc.com \
--cc=chunyan.zhang@unisoc.com \
--cc=jason.wu@unisoc.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
--cc=orsonzhai@gmail.com \
--cc=ulf.hansson@linaro.org \
--cc=zhang.chunyan@linaro.org \
--cc=zhang.lyra@gmail.com \
/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).