Kernel/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2025-01-11 23:50:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

[MMC] Cleanup 385e3227d4d83ab13d7767c4bb3593b0256bf246

Browse Source 
Rather than having two places which independently calculate the
timeout for data transfers, make it a library function instead.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Acked-by: Pierre Ossman <drzeus@drzeus.cx>
This commit is contained in:
Russell King 2006-09-07 15:57:12 +01:00 committed by Russell King
parent 148f93d59c
commit d773d72551
3 changed files with 53 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

64
drivers/mmc/mmc.c
View File

@ -247,6 +247,55 @@ int mmc_wait_for_app_cmd(struct mmc_host *host, unsigned int rca,
EXPORT_SYMBOL(mmc_wait_for_app_cmd); EXPORT_SYMBOL(mmc_wait_for_app_cmd);
/**
* mmc_set_data_timeout - set the timeout for a data command
* @data: data phase for command
* @card: the MMC card associated with the data transfer
* @write: flag to differentiate reads from writes
*/
void mmc_set_data_timeout(struct mmc_data *data, const struct mmc_card *card,
int write)
{
unsigned int mult;
/*
* SD cards use a 100 multiplier rather than 10
*/
mult = mmc_card_sd(card) ? 100 : 10;
/*
* Scale up the multiplier (and therefore the timeout) by
* the r2w factor for writes.
*/
if (write)
mult <<= card->csd.r2w_factor;
data->timeout_ns = card->csd.tacc_ns * mult;
data->timeout_clks = card->csd.tacc_clks * mult;
/*
* SD cards also have an upper limit on the timeout.
*/
if (mmc_card_sd(card)) {
unsigned int timeout_us, limit_us;
timeout_us = data->timeout_ns / 1000;
timeout_us += data->timeout_clks * 1000 /
(card->host->ios.clock / 1000);
if (write)
limit_us = 250000;
else
limit_us = 100000;
if (timeout_us > limit_us) {
data->timeout_ns = limit_us * 1000;
data->timeout_clks = 0;
}
}
}
EXPORT_SYMBOL(mmc_set_data_timeout);
static int mmc_select_card(struct mmc_host *host, struct mmc_card *card); static int mmc_select_card(struct mmc_host *host, struct mmc_card *card);
/** /**
@ -908,12 +957,9 @@ static void mmc_read_scrs(struct mmc_host *host)
{ {
int err; int err;
struct mmc_card *card; struct mmc_card *card;
struct mmc_request mrq; struct mmc_request mrq;
struct mmc_command cmd; struct mmc_command cmd;
struct mmc_data data; struct mmc_data data;
unsigned int timeout_us;
struct scatterlist sg; struct scatterlist sg;
list_for_each_entry(card, &host->cards, node) { list_for_each_entry(card, &host->cards, node) {
@ -948,17 +994,7 @@ static void mmc_read_scrs(struct mmc_host *host)
memset(&data, 0, sizeof(struct mmc_data)); memset(&data, 0, sizeof(struct mmc_data));
data.timeout_ns = card->csd.tacc_ns * 100; mmc_set_data_timeout(&data, card, 0);
data.timeout_clks = card->csd.tacc_clks * 100;
timeout_us = data.timeout_ns / 1000;
timeout_us += data.timeout_clks * 1000 /
(host->ios.clock / 1000);
if (timeout_us > 100000) {
data.timeout_ns = 100000000;
data.timeout_clks = 0;
}
data.blksz_bits = 3; data.blksz_bits = 3;
data.blksz = 1 << 3; data.blksz = 1 << 3;

35
drivers/mmc/mmc_block.c
View File

@ -179,40 +179,7 @@ static int mmc_blk_issue_rq(struct mmc_queue *mq, struct request *req)
brq.stop.arg = 0; brq.stop.arg = 0;
brq.stop.flags = MMC_RSP_R1B | MMC_CMD_AC; brq.stop.flags = MMC_RSP_R1B | MMC_CMD_AC;
brq.data.timeout_ns = card->csd.tacc_ns * 10; mmc_set_data_timeout(&brq.data, card, rq_data_dir(req) != READ);
brq.data.timeout_clks = card->csd.tacc_clks * 10;
/*
* Scale up the timeout by the r2w factor
*/
if (rq_data_dir(req) == WRITE) {
brq.data.timeout_ns <<= card->csd.r2w_factor;
brq.data.timeout_clks <<= card->csd.r2w_factor;
}
/*
* SD cards use a 100 multiplier and has a upper limit
*/
if (mmc_card_sd(card)) {
unsigned int limit_us, timeout_us;
brq.data.timeout_ns *= 10;
brq.data.timeout_clks *= 10;
if (rq_data_dir(req) == READ)
limit_us = 100000;
else
limit_us = 250000;
timeout_us = brq.data.timeout_ns / 1000;
timeout_us += brq.data.timeout_clks * 1000 /
(card->host->ios.clock / 1000);
if (timeout_us > limit_us) {
brq.data.timeout_ns = limit_us * 1000;
brq.data.timeout_clks = 0;
}
}
if (rq_data_dir(req) == READ) { if (rq_data_dir(req) == READ) {
brq.cmd.opcode = brq.data.blocks > 1 ? MMC_READ_MULTIPLE_BLOCK : MMC_READ_SINGLE_BLOCK; brq.cmd.opcode = brq.data.blocks > 1 ? MMC_READ_MULTIPLE_BLOCK : MMC_READ_SINGLE_BLOCK;

2
include/linux/mmc/mmc.h
View File

@ -105,6 +105,8 @@ extern int mmc_wait_for_cmd(struct mmc_host *, struct mmc_command *, int);
extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int, extern int mmc_wait_for_app_cmd(struct mmc_host *, unsigned int,
struct mmc_command *, int); struct mmc_command *, int);
extern void mmc_set_data_timeout(struct mmc_data *, const struct mmc_card *, int);
extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card); extern int __mmc_claim_host(struct mmc_host *host, struct mmc_card *card);
static inline void mmc_claim_host(struct mmc_host *host) static inline void mmc_claim_host(struct mmc_host *host)