From mboxrd@z Thu Jan 1 00:00:00 1970 From: Kevin Liu Subject: [PATCH v6 01/14] mmc: sdhci: fix transfer mode setting bug for cmds w/o data transfer Date: Wed, 17 Oct 2012 19:04:40 +0800 Message-ID: <1350471893-29633-2-git-send-email-keyuan.liu@gmail.com> References: <1350471893-29633-1-git-send-email-keyuan.liu@gmail.com> Return-path: Received: from na3sys009aog138.obsmtp.com ([74.125.149.19]:34280 "EHLO na3sys009aog138.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1756180Ab2JQLFH (ORCPT ); Wed, 17 Oct 2012 07:05:07 -0400 In-Reply-To: <1350471893-29633-1-git-send-email-keyuan.liu@gmail.com> Sender: linux-mmc-owner@vger.kernel.org List-Id: linux-mmc@vger.kernel.org To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu, ulf.hansson@linaro.org, zgao6@marvell.com Cc: hzhuang1@marvell.com, cxie4@marvell.com, prakity@marvell.com, kliu5@marvell.com, Jialing Fu , Tim Wang From: Kevin Liu 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. Reviewed By: Girish K S Reviewed-by: Zhangfei Gao Signed-off-by: Jialing Fu Signed-off-by: Tim Wang Signed-off-by: Kevin Liu --- 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 7922adb..dc493ba 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) { + 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