From: Andrei Warkentin <andreiw@motorola.com>
To: linux-mmc@vger.kernel.org
Cc: arnd@arndb.de, cjb@laptop.org, Andrei Warkentin <andreiw@motorola.com>
Subject: [patchv3 1/4] MMC: Rename erase_timeout to cmd_timeout_ms.
Date: Mon, 11 Apr 2011 16:13:41 -0500 [thread overview]
Message-ID: <1302556424-21951-1-git-send-email-andreiw@motorola.com> (raw)
In-Reply-To: <BANLkTikA56sD_A6VVPF15SgA-AnKOZ2ZXw@mail.gmail.com>
Renames erase_timeout to cmd_timeout_ms inside struct mmc_command.
First step to making host honor timeouts for non-data-transfer
commands. Cleans up erase timeout code.
Signed-off-by: Andrei Warkentin <andreiw@motorola.com>
---
drivers/mmc/core/core.c | 39 +++++++++++++++++++++------------------
include/linux/mmc/core.h | 2 +-
2 files changed, 22 insertions(+), 19 deletions(-)
diff --git a/drivers/mmc/core/core.c b/drivers/mmc/core/core.c
index 1f453ac..8a000d2 100644
--- a/drivers/mmc/core/core.c
+++ b/drivers/mmc/core/core.c
@@ -1187,9 +1187,8 @@ void mmc_init_erase(struct mmc_card *card)
}
}
-static void mmc_set_mmc_erase_timeout(struct mmc_card *card,
- struct mmc_command *cmd,
- unsigned int arg, unsigned int qty)
+static unsigned int mmc_mmc_erase_timeout(struct mmc_card *card,
+ unsigned int arg, unsigned int qty)
{
unsigned int erase_timeout;
@@ -1246,38 +1245,42 @@ static void mmc_set_mmc_erase_timeout(struct mmc_card *card,
if (mmc_host_is_spi(card->host) && erase_timeout < 1000)
erase_timeout = 1000;
- cmd->erase_timeout = erase_timeout;
+ return erase_timeout;
}
-static void mmc_set_sd_erase_timeout(struct mmc_card *card,
- struct mmc_command *cmd, unsigned int arg,
- unsigned int qty)
+static unsigned int mmc_sd_erase_timeout(struct mmc_card *card,
+ unsigned int arg,
+ unsigned int qty)
{
+ unsigned int erase_timeout;
+
if (card->ssr.erase_timeout) {
/* Erase timeout specified in SD Status Register (SSR) */
- cmd->erase_timeout = card->ssr.erase_timeout * qty +
- card->ssr.erase_offset;
+ erase_timeout = card->ssr.erase_timeout * qty +
+ card->ssr.erase_offset;
} else {
/*
* Erase timeout not specified in SD Status Register (SSR) so
* use 250ms per write block.
*/
- cmd->erase_timeout = 250 * qty;
+ erase_timeout = 250 * qty;
}
/* Must not be less than 1 second */
- if (cmd->erase_timeout < 1000)
- cmd->erase_timeout = 1000;
+ if (erase_timeout < 1000)
+ erase_timeout = 1000;
+
+ return erase_timeout;
}
-static void mmc_set_erase_timeout(struct mmc_card *card,
- struct mmc_command *cmd, unsigned int arg,
- unsigned int qty)
+static unsigned int mmc_erase_timeout(struct mmc_card *card,
+ unsigned int arg,
+ unsigned int qty)
{
if (mmc_card_sd(card))
- mmc_set_sd_erase_timeout(card, cmd, arg, qty);
+ return mmc_sd_erase_timeout(card, arg, qty);
else
- mmc_set_mmc_erase_timeout(card, cmd, arg, qty);
+ return mmc_mmc_erase_timeout(card, arg, qty);
}
static int mmc_do_erase(struct mmc_card *card, unsigned int from,
@@ -1351,7 +1354,7 @@ static int mmc_do_erase(struct mmc_card *card, unsigned int from,
cmd.opcode = MMC_ERASE;
cmd.arg = arg;
cmd.flags = MMC_RSP_SPI_R1B | MMC_RSP_R1B | MMC_CMD_AC;
- mmc_set_erase_timeout(card, &cmd, arg, qty);
+ cmd.cmd_timeout_ms = mmc_erase_timeout(card, arg, qty);
err = mmc_wait_for_cmd(card->host, &cmd, 0);
if (err) {
printk(KERN_ERR "mmc_erase: erase error %d, status %#x\n",
diff --git a/include/linux/mmc/core.h b/include/linux/mmc/core.h
index 07f27af..811e96e 100644
--- a/include/linux/mmc/core.h
+++ b/include/linux/mmc/core.h
@@ -92,7 +92,7 @@ struct mmc_command {
* actively failing requests
*/
- unsigned int erase_timeout; /* in milliseconds */
+ unsigned int cmd_timeout_ms; /* in milliseconds */
struct mmc_data *data; /* data segment associated with cmd */
struct mmc_request *mrq; /* associated request */
--
1.7.0.4
next prev parent reply other threads:[~2011-04-11 20:34 UTC|newest]
Thread overview: 63+ messages / expand[flat|nested] mbox.gz Atom feed top
2011-03-19 11:18 MMC/eMMC partitioning support Andrei Warkentin
2011-03-19 11:18 ` [RFC] MMC: MMC boot partitions support Andrei Warkentin
2011-03-19 12:13 ` Andrei Warkentin
2011-03-21 14:19 ` [PATCH] " Andrei Warkentin
2011-03-22 3:54 ` [PATCHv3] " Andrei Warkentin
2011-03-22 21:11 ` MMC partitions support (4th revision) Andrei Warkentin
2011-03-22 21:11 ` [PATCHv4] MMC: MMC boot partitions support Andrei Warkentin
2011-03-29 22:45 ` Andrei Warkentin
2011-03-30 12:03 ` Arnd Bergmann
2011-03-30 20:07 ` Andrei Warkentin
2011-03-30 22:43 ` Chris Ball
2011-03-30 22:46 ` Chris Ball
2011-03-30 23:18 ` Andrei Warkentin
2011-03-30 23:34 ` Chris Ball
2011-03-31 6:57 ` Andrei Warkentin
2011-03-31 11:01 ` Arnd Bergmann
2011-03-31 19:17 ` Andrei Warkentin
2011-03-31 19:37 ` Chris Ball
2011-03-31 20:01 ` Andrei Warkentin
2011-03-31 20:03 ` Chris Ball
2011-03-31 20:01 ` Andrei Warkentin
2011-04-01 9:23 ` Arnd Bergmann
2011-04-01 14:52 ` Chris Ball
2011-04-01 9:21 ` Arnd Bergmann
2011-03-31 11:17 ` Arnd Bergmann
2011-03-31 19:29 ` Andrei Warkentin
2011-04-01 10:38 ` Arnd Bergmann
2011-04-01 18:42 ` Andrei Warkentin
2011-04-01 19:25 ` Arnd Bergmann
2011-04-01 19:42 ` Andrei Warkentin
2011-04-04 12:22 ` [PATCH] " Andrei Warkentin
2011-04-04 11:52 ` Andrei Warkentin
2011-04-11 21:13 ` Andrei Warkentin [this message]
2011-04-11 21:13 ` [patchv3 2/4] MMC: SDHCI R1B command handling + MMC_CAP_ERASE Andrei Warkentin
2011-04-12 9:06 ` Dong, Chuanxiao
2011-04-12 18:05 ` Andrei Warkentin
2011-04-13 1:59 ` Dong, Chuanxiao
2011-04-13 5:44 ` Andrei Warkentin
2011-04-15 21:34 ` Cyril Hrubis
2011-08-10 13:30 ` Chris Ball
2011-04-11 21:13 ` [patchv3 3/4] MMC: Allow setting CMD timeout for CMD6 (SWITCH) Andrei Warkentin
2011-04-11 21:13 ` [patchv3 4/4] MMC: MMC boot partitions support Andrei Warkentin
2011-04-11 22:00 ` Chris Ball
2011-04-11 22:10 ` Andrei Warkentin
2011-04-11 22:22 ` Chris Ball
2011-04-11 22:18 ` Andrei Warkentin
2011-04-11 23:10 ` [patchv4 1/2] MMC: block.c cleanup for host claim/release Andrei Warkentin
2011-04-11 23:10 ` [patchv4 2/2] MMC: MMC boot partitions support Andrei Warkentin
2011-04-11 23:20 ` [patchv3 4/4] " Chris Ball
2011-04-11 23:24 ` Andrei Warkentin
2011-04-21 1:13 ` Chris Ball
2011-04-21 1:30 ` Chris Ball
2011-04-21 5:09 ` Philip Rakity
2011-04-21 5:22 ` Chris Ball
2011-04-21 5:31 ` Andrei Warkentin
2011-04-21 6:07 ` [RFC] MMC: Block: Ensure hardware partitions don't mess with mmcblk device naming Andrei Warkentin
2011-04-21 8:17 ` Andrei Warkentin
2011-04-21 14:44 ` Chris Ball
2011-04-22 0:20 ` Chris Ball
2011-04-22 3:46 ` [PATCH] " Andrei Warkentin
2011-04-22 3:50 ` Andrei Warkentin
2011-04-22 22:34 ` Chris Ball
2011-04-21 4:31 ` [patchv3 4/4] MMC: MMC boot partitions support Jaehoon Chung
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=1302556424-21951-1-git-send-email-andreiw@motorola.com \
--to=andreiw@motorola.com \
--cc=arnd@arndb.de \
--cc=cjb@laptop.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;
as well as URLs for NNTP newsgroup(s).