by Chunyan Zhang

[permalink] [raw]

Subject: Re: [PATCH V3 4/7] mmc: sdhci: add 32-bit block count support for v4 mode

On 17 July 2018 at 16:29, Adrian Hunter <[email protected]> wrote:
> On 09/07/18 06:19, Chunyan Zhang wrote:
>> When Host Version 4 is enabled, SDMA System Address register is
>> re-defined as 32-bit Block Count, and SDMA uses ADMA System
>> Address register (05Fh-058h) instead.
>>
>> Signed-off-by: Chunyan Zhang <[email protected]>
>> ---
>> drivers/mmc/host/sdhci.c | 4 +++-
>> drivers/mmc/host/sdhci.h | 1 +
>> 2 files changed, 4 insertions(+), 1 deletion(-)
>>
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index 7871ae2..f64e766 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -889,6 +889,7 @@ static void sdhci_set_timeout(struct sdhci_host *host, struct mmc_command *cmd)
>> static void sdhci_prepare_data(struct sdhci_host *host, struct mmc_command *cmd)
>> {
>> u8 ctrl;
>> + u32 reg;
>> struct mmc_data *data = cmd->data;
>>
>> host->data_timeout = 0;
>> @@ -1021,7 +1022,8 @@ 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);
>> + reg = host->v4_mode ? SDHCI_32BIT_BLK_CNT : SDHCI_BLOCK_COUNT;
>> + sdhci_writew(host, data->blocks, reg);
>
> The specification says to set 16-bit block count register to zero when using
> 32-bit block count. It also says it is valid for V4.1 onwards and also for

I found that the 16-bit block count register is zero without being
wrriten by driver, and the weird thing on my board is that the
initialization would be interrupted by SDHCI_INT_ADMA_ERROR if setting
"16-bit block count register" to zero manually. So I will add a check
of whether it is zero already before writing it.

> V4 with SDMA and auto-CMD23.
>
> So maybe we should continue to use the 16-bit block count register with V4.0
>
>> }
>>
>> 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 24fa58a..889e48b 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))
>>
>

2018-07-23 07:13:57

by Chunyan Zhang

[permalink] [raw]

Subject: Re: [PATCH V3 5/7] mmc: sdhci: add Auto CMD Auto Select support

On 17 July 2018 at 19:16, Adrian Hunter <[email protected]> wrote:
> On 09/07/18 06:19, Chunyan Zhang wrote:
>> As SD Host Controller Specification v4.10 documents:
>> Host Controller Version 4.10 defines this "Auto CMD Auto Select" mode.
>> Selection of Auto CMD depends on setting of CMD23 Enable in the Host
>> Control 2 register which indicates whether card supports CMD23. If CMD23
>> Enable =1, Auto CMD23 is used and if CMD23 Enable =0, Auto CMD12 is
>> used. In case of Version 4.10 or later, use of Auto CMD Auto Select is
>> recommended rather than use of Auto CMD12 Enable or Auto CMD23
>> Enable.
>>
>> This patch add this new mode support.
>>
>> Signed-off-by: Chunyan Zhang <[email protected]>
>> ---
>> drivers/mmc/host/sdhci.c | 39 ++++++++++++++++++++++++++++-----------
>> drivers/mmc/host/sdhci.h | 2 ++
>> 2 files changed, 30 insertions(+), 11 deletions(-)
>>
>> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
>> index f64e766..1ca3871 100644
>> --- a/drivers/mmc/host/sdhci.c
>> +++ b/drivers/mmc/host/sdhci.c
>> @@ -1033,6 +1033,33 @@ static inline bool sdhci_auto_cmd12(struct sdhci_host *host,
>> !mrq->cap_cmd_during_tfr;
>> }
>>
>> +static inline void sdhci_auto_cmd_enable(struct sdhci_host *host,
>> + struct mmc_command *cmd,
>> + u16 *mode)
>> +{
>> + /*
>> + * In case of Version 4.10 or later, use of 'Auto CMD Auto
>> + * Select' is recommended rather than use of 'Auto CMD12
>> + * Enable' or 'Auto CMD23 Enable'.
>> + */
>> + if (host->version >= SDHCI_SPEC_410) {
>> + *mode |= SDHCI_TRNS_AUTO_SEL;
>
> The rules for selecting auto commands still need to be applied. In effect:
>
> if (sdhci_auto_cmd12(host, cmd->mrq) &&
> (cmd->opcode != SD_IO_RW_EXTENDED)) {
> *mode |= SDHCI_TRNS_AUTO_SEL;
> } else if (cmd->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23)) {
> *mode |= SDHCI_TRNS_AUTO_SEL;
> sdhci_writel(host, cmd->mrq->sbc->arg, SDHCI_ARGUMENT2);

The fact seems that SDHCI_TRNS_AUTO_SEL mode don't need
SDHCI_ARGUMENT2 register being written. The test result on my board
showed that mounting a blk partition would fail due to lack of a
hardware interrupt if SDHCI_ARGUMENT2 was set like above.

> }
>
> Also the selection of Host Control 2 register CMD23 Enable should be done by
> SDHCI (if supported by the card) not the Spreadtrum driver.

Ok.

>
>> + return;
>> + }
>> +
>> + /*
>> + * If we are sending CMD23, CMD12 never gets sent
>> + * on successful completion (so no Auto-CMD12).
>> + */
>> + if (sdhci_auto_cmd12(host, cmd->mrq) &&
>> + (cmd->opcode != SD_IO_RW_EXTENDED)) {
>> + *mode |= SDHCI_TRNS_AUTO_CMD12;
>> + } else if (cmd->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23)) {
>> + *mode |= SDHCI_TRNS_AUTO_CMD23;
>> + sdhci_writel(host, cmd->mrq->sbc->arg, SDHCI_ARGUMENT2);
>> + }
>> +}
>> +
>> static void sdhci_set_transfer_mode(struct sdhci_host *host,
>> struct mmc_command *cmd)
>> {
>> @@ -1059,17 +1086,7 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
>>
>> if (mmc_op_multi(cmd->opcode) || data->blocks > 1) {
>> mode = SDHCI_TRNS_BLK_CNT_EN | SDHCI_TRNS_MULTI;
>> - /*
>> - * If we are sending CMD23, CMD12 never gets sent
>> - * on successful completion (so no Auto-CMD12).
>> - */
>> - if (sdhci_auto_cmd12(host, cmd->mrq) &&
>> - (cmd->opcode != SD_IO_RW_EXTENDED))
>> - mode |= SDHCI_TRNS_AUTO_CMD12;
>> - else if (cmd->mrq->sbc && (host->flags & SDHCI_AUTO_CMD23)) {
>> - mode |= SDHCI_TRNS_AUTO_CMD23;
>> - sdhci_writel(host, cmd->mrq->sbc->arg, SDHCI_ARGUMENT2);
>> - }
>> + sdhci_auto_cmd_enable(host, cmd, &mode);
>> }
>>
>> if (data->flags & MMC_DATA_READ)
>> diff --git a/drivers/mmc/host/sdhci.h b/drivers/mmc/host/sdhci.h
>> index 889e48b..8263ac6 100644
>> --- a/drivers/mmc/host/sdhci.h
>> +++ b/drivers/mmc/host/sdhci.h
>> @@ -42,6 +42,7 @@
>> #define SDHCI_TRNS_BLK_CNT_EN 0x02
>> #define SDHCI_TRNS_AUTO_CMD12 0x04
>> #define SDHCI_TRNS_AUTO_CMD23 0x08
>> +#define SDHCI_TRNS_AUTO_SEL 0x0C
>> #define SDHCI_TRNS_READ 0x10
>> #define SDHCI_TRNS_MULTI 0x20
>>
>> @@ -185,6 +186,7 @@
>> #define SDHCI_CTRL_DRV_TYPE_D 0x0030
>> #define SDHCI_CTRL_EXEC_TUNING 0x0040
>> #define SDHCI_CTRL_TUNED_CLK 0x0080
>> +#define SDHCI_CMD23_ENABLE 0x0800
>> #define SDHCI_CTRL_V4_MODE 0x1000
>> #define SDHCI_CTRL_64BIT_ADDR 0x2000
>> #define SDHCI_CTRL_PRESET_VAL_ENABLE 0x8000
>>
>