From: Chuanxiao Dong <chuanxiao.dong@intel.com>
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
Date: Thu, 18 Nov 2010 17:00:53 +0800 [thread overview]
Message-ID: <20101118090053.GC18161@intel.com> (raw)
>From 6ddad5c28d1f2d57081df051b79912dde922e322 Mon Sep 17 00:00:00 2001
From: Chuanxiao Dong <chuanxiao.dong@intel.com>
Date: Thu, 18 Nov 2010 16:20:39 +0800
Subject: [PATCH 2/3] mmc: set erase control reg value for sdhci HC
For those sdhci host controller which cannot erase the unlimited sectors,
set their timeout value to be the maximum one which is safe for erasing.
Signed-off-by: Chuanxiao Dong <chuanxiao.dong@intel.com>
---
drivers/mmc/core/core.c | 4 ++++
drivers/mmc/host/sdhci.c | 6 ++++++
2 files changed, 10 insertions(+), 0 deletions(-)
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);
}
--
1.6.6.1
reply other threads:[~2010-11-18 9:03 UTC|newest]
Thread overview: [no followups] expand[flat|nested] mbox.gz Atom feed
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20101118090053.GC18161@intel.com \
--to=chuanxiao.dong@intel.com \
--cc=alan@linux.intel.com \
--cc=arjan@linux.intel.com \
--cc=cjb@laptop.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-mmc@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox