Skip to content

Commit 85a3f77

Browse files
committed
mmc: cb710: Inform the mmc core about the maximum busy timeout
Some commands uses R1B responses, which means the card may assert the DAT0 line to signal busy for a period of time, after it has received the command. The mmc core normally specifies the busy period for the command in the cmd->busy_timeout. Ideally the driver should respect it, but that requires quite some update of the code, so let's defer that to someone with the HW at hand. Instead, let's inform the mmc core about the maximum supported busy timeout in ->max_busy_timeout during ->probe(). This value corresponds to the fixed ~2s timeout of the polling loop, implemented in cb710_wait_for_event(). In this way, we let the mmc core validate the needed timeout, which may lead to that it converts from a R1B into a R1 response and then use CMD13 to poll for busy completion. In other words, this change enables support for commands with longer busy periods than 2s, like erase (CMD38) for example. Cc: Michał Mirosław <[email protected]> Signed-off-by: Ulf Hansson <[email protected]> Link: https://lore.kernel.org/r/[email protected]
1 parent f4f20d6 commit 85a3f77

File tree

1 file changed

+8
-0
lines changed

1 file changed

+8
-0
lines changed

drivers/mmc/host/cb710-mmc.c

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,8 @@
1010
#include <linux/delay.h>
1111
#include "cb710-mmc.h"
1212

13+
#define CB710_MMC_REQ_TIMEOUT_MS 2000
14+
1315
static const u8 cb710_clock_divider_log2[8] = {
1416
/* 1, 2, 4, 8, 16, 32, 128, 512 */
1517
0, 1, 2, 3, 4, 5, 7, 9
@@ -707,6 +709,12 @@ static int cb710_mmc_init(struct platform_device *pdev)
707709
mmc->f_min = val >> cb710_clock_divider_log2[CB710_MAX_DIVIDER_IDX];
708710
mmc->ocr_avail = MMC_VDD_32_33|MMC_VDD_33_34;
709711
mmc->caps = MMC_CAP_4_BIT_DATA;
712+
/*
713+
* In cb710_wait_for_event() we use a fixed timeout of ~2s, hence let's
714+
* inform the core about it. A future improvement should instead make
715+
* use of the cmd->busy_timeout.
716+
*/
717+
mmc->max_busy_timeout = CB710_MMC_REQ_TIMEOUT_MS;
710718

711719
reader = mmc_priv(mmc);
712720

0 commit comments

Comments
 (0)