On 25 September 2012 19:38, Kevin Liu <keyuan.liu@xxxxxxxxx> wrote:
> From: Kevin Liu <kliu5@xxxxxxxxxxx>
>
> Commands without data transfer like cmd5/cmd7 will use previous
> transfer mode setting, which may lead to error since some bits
> may have been set unexpectedly.
> For example, cmd5 following cmd18/cmd25 will have timeout error
> since audo cmd23 has been enabled.
>
> Signed-off-by: Jialing Fu <jlfu@xxxxxxxxxxx>
> Signed-off-by: Tim Wang <wangtt@xxxxxxxxxxx>
> Signed-off-by: Kevin Liu <kliu5@xxxxxxxxxxx>
> ---
> drivers/mmc/host/sdhci.c | 22 ++++++++++++++--------
> 1 files changed, 14 insertions(+), 8 deletions(-)
>
> diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c
> index 0e15c79..2f844e5 100644
> --- a/drivers/mmc/host/sdhci.c
> +++ b/drivers/mmc/host/sdhci.c
> @@ -886,8 +886,21 @@ static void sdhci_set_transfer_mode(struct sdhci_host *host,
> u16 mode;
> struct mmc_data *data = cmd->data;
>
> - if (data == NULL)
> + if (data == NULL) {
Even though its kept as it is in the prev code. avoid explicit check
for NULL. can use !data which is commonly used
> + if (cmd->opcode == MMC_SEND_TUNING_BLOCK ||
> + cmd->opcode == MMC_SEND_TUNING_BLOCK_HS200)
> + /*
> + * The tuning block is sent by the card to the host
> + * controller. So we set the TRNS_READ bit in the
> + * Transfer Mode register. This also takes care of
> + * setting DMA Enable and Multi Block Select in the
> + * same register to 0.
> + */
> + sdhci_writew(host, SDHCI_TRNS_READ, SDHCI_TRANSFER_MODE);
> + else
> + sdhci_writew(host, 0, SDHCI_TRANSFER_MODE);
> return;
> + }
>
> WARN_ON(!host->data);
>
> @@ -1850,13 +1863,6 @@ static int sdhci_execute_tuning(struct mmc_host *mmc, u32 opcode)
> SDHCI_BLOCK_SIZE);
> }
>
> - /*
> - * The tuning block is sent by the card to the host controller.
> - * So we set the TRNS_READ bit in the Transfer Mode register.
> - * This also takes care of setting DMA Enable and Multi Block
> - * Select in the same register to 0.
> - */
> - sdhci_writew(host, SDHCI_TRNS_READ, SDHCI_TRANSFER_MODE);
>
> sdhci_send_command(host, &cmd);
>
> --
> 1.7.0.4
>
> --
> To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
> the body of a message to majordomo@xxxxxxxxxxxxxxx
> More majordomo info at http://vger.kernel.org/majordomo-info.html
--
To unsubscribe from this list: send the line "unsubscribe linux-mmc" in
the body of a message to majordomo@xxxxxxxxxxxxxxx
More majordomo info at http://vger.kernel.org/majordomo-info.html
