From patchwork Mon Sep 10 03:17:29 2012 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kevin Liu X-Patchwork-Id: 1429261 Return-Path: X-Original-To: patchwork-linux-mmc@patchwork.kernel.org Delivered-To: patchwork-process-083081@patchwork1.kernel.org Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by patchwork1.kernel.org (Postfix) with ESMTP id 5EF3A402E1 for ; Mon, 10 Sep 2012 03:22:23 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756252Ab2IJDWW (ORCPT ); Sun, 9 Sep 2012 23:22:22 -0400 Received: from na3sys009aog117.obsmtp.com ([74.125.149.242]:41345 "EHLO na3sys009aog117.obsmtp.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755074Ab2IJDWW (ORCPT ); Sun, 9 Sep 2012 23:22:22 -0400 Received: from MSI-MTA.marvell.com ([65.219.4.132]) (using TLSv1) by na3sys009aob117.postini.com ([74.125.148.12]) with SMTP ID DSNKUE1c5TAPoaktPGDeChSsr/AIP0FM8JYJ@postini.com; Sun, 09 Sep 2012 20:22:21 PDT Received: from maili.marvell.com ([10.68.76.210]) by MSI-MTA.marvell.com with Microsoft SMTPSVC(6.0.3790.3959); Sun, 9 Sep 2012 20:20:52 -0700 Received: from localhost.localdomain (unknown [10.38.36.240]) by maili.marvell.com (Postfix) with ESMTP id B74B14E510; Sun, 9 Sep 2012 20:20:51 -0700 (PDT) From: Kevin Liu To: linux-mmc@vger.kernel.org, cjb@laptop.org, pierre@ossman.eu Cc: cxie4@marvell.com, hzhuang1@marvell.com, prakity@marvell.com, wangtt@marvell.com, jlfu@marvell.com, kliu5@marvell.com Subject: [PATCH] mmc: sdhci: fix transfer mode setting bug for cmds w/o data transfer Date: Mon, 10 Sep 2012 11:17:29 +0800 Message-Id: <1347247049-19422-1-git-send-email-keyuan.liu@gmail.com> X-Mailer: git-send-email 1.7.0.4 X-OriginalArrivalTime: 10 Sep 2012 03:20:52.0850 (UTC) FILETIME=[488D3520:01CD8F03] Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org 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. 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 834be2f..962f696 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -885,8 +885,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) { + 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); @@ -1854,13 +1867,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);