From patchwork Thu Nov 18 09:00:53 2010 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: "Chuanxiao.Dong" X-Patchwork-Id: 335381 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by demeter1.kernel.org (8.14.4/8.14.3) with ESMTP id oAI93HlD010353 for ; Thu, 18 Nov 2010 09:03:17 GMT Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751686Ab0KRJDK (ORCPT ); Thu, 18 Nov 2010 04:03:10 -0500 Received: from mga02.intel.com ([134.134.136.20]:52104 "EHLO mga02.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755760Ab0KRJDJ convert rfc822-to-8bit (ORCPT ); Thu, 18 Nov 2010 04:03:09 -0500 Received: from orsmga002.jf.intel.com ([10.7.209.21]) by orsmga101.jf.intel.com with ESMTP; 18 Nov 2010 01:03:08 -0800 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="4.59,216,1288594800"; d="scan'208,223";a="575038044" Received: from unknown (HELO intel.com) ([172.16.120.128]) by orsmga002.jf.intel.com with ESMTP; 18 Nov 2010 01:03:07 -0800 Date: Thu, 18 Nov 2010 17:00:53 +0800 From: Chuanxiao Dong To: cjb@laptop.org Cc: linux-mmc@vger.kernel.org, linux-kernel@vger.kernel.org, alan@linux.intel.com, arjan@linux.intel.com Subject: [PATCH v2 2/3]mmc: set erase control register for SDHCI HC Message-ID: <20101118090053.GC18161@intel.com> Reply-To: Chuanxiao Dong MIME-Version: 1.0 Content-Disposition: inline User-Agent: Mutt/1.5.19 (2009-01-05) Sender: linux-mmc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-mmc@vger.kernel.org X-Greylist: IP, sender and recipient auto-whitelisted, not delayed by milter-greylist-4.2.3 (demeter1.kernel.org [140.211.167.41]); Thu, 18 Nov 2010 09:03:17 +0000 (UTC) diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c index 947d963..0b77739 100644 --- a/drivers/mmc/core/core.c +++ b/drivers/mmc/core/core.c @@ -170,6 +170,9 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) mrq->cmd->error = 0; mrq->cmd->mrq = mrq; + if (mrq->cmd->opcode != MMC_ERASE) + mrq->cmd->erase_timeout = 0; + if (mrq->data) { BUG_ON(mrq->data->blksz > host->max_blk_size); BUG_ON(mrq->data->blocks > host->max_blk_count); @@ -190,6 +193,7 @@ mmc_start_request(struct mmc_host *host, struct mmc_request *mrq) mrq->data->stop = mrq->stop; mrq->stop->error = 0; mrq->stop->mrq = mrq; + mrq->stop->erase_timeout = 0; } } mmc_host_clk_ungate(host); diff --git a/drivers/mmc/host/sdhci.c b/drivers/mmc/host/sdhci.c index fa66988..a466635 100644 --- a/drivers/mmc/host/sdhci.c +++ b/drivers/mmc/host/sdhci.c @@ -946,6 +946,12 @@ static void sdhci_send_command(struct sdhci_host *host, struct mmc_command *cmd) if (cmd->data) flags |= SDHCI_CMD_DATA; + if (host->quirks & SDHCI_QUIRK_FORCE_ERASE_SINGLE) { + /* Set the timeout to be the maximum value */ + if (cmd->erase_timeout) + sdhci_writeb(host, 0xE, SDHCI_TIMEOUT_CONTROL); + } + sdhci_writew(host, SDHCI_MAKE_CMD(cmd->opcode, flags), SDHCI_COMMAND); }