omap_hsmmc: set a large data timeout for commands with busy signal
Subsystems (2)
PATCH 72/232 omap_hsmmc: set a large data timeout for commands with busy signal
From: Adrian Hunter <[email protected]>
Commands like SWITCH (CMD6) send a response and then signal busy while the operation is completed. These commands are expected to always succeed (otherwise the response would have indicated an error).
Set an arbitrarily large data timeout value (100ms) for these commands to ensure that premature timeouts do not occur.
Signed-off-by Adrian Hunter <[email protected]>
Acked-by Matt Fleming <[email protected]>
Cc Ian Molton <[email protected]>
Cc "Roberto A. Foglietta" <[email protected]>
Cc Jarkko Lavinen <[email protected]>
Cc Denis Karpov <[email protected]>
Cc Pierre Ossman <[email protected]>
Cc Philip Langdale <[email protected]>
Cc "Madhusudhan" <[email protected]>
Cc <[email protected]>
Signed-off-by Andrew Morton <[email protected]>
---
drivers/mmc/host/omap_hsmmc.c | 15 +++++++++++---- 1 file changed, 11 insertions(+), 4 deletions(-)
drivers/mmc/host/omap_hsmmc.c renamed from drivers/mmc/host/omap_hsmmc.c~omap_hsmmc-set-a-large-data-timeout-for-commands-with-busy-signal +11 -4
@@ -997,7 +997,8 @@ static int omap_hsmmc_start_dma_transfer }static void set_data_timeout (struct omap_hsmmc_host *host, -struct mmc_request *req) +unsigned int timeout_ns, +unsigned int timeout_clks) {unsigned int timeout, cycle_ns;uint32_t reg, clkd, dto =0 ;
@@ -1008,8 +1009,8 @@ static void set_data_timeout(struct omap clkd =1 ; cycle_ns =1000000000 / (clk_get_rate (host->fclk) / clkd); - timeout = req->data->timeout_ns / cycle_ns; - timeout += req->data->timeout_clks; + timeout = timeout_ns / cycle_ns; + timeout += timeout_clks;if (timeout) {while ((timeout &0x80000000 ) ==0 ) { dto +=1 ;
@@ -1043,12 +1044,18 @@ omap_hsmmc_prepare_data(struct omap_hsmmif (req->data ==NULL ) {OMAP_HSMMC_WRITE (host->base,BLK ,0 ); +/* +* Set an arbitrary 100ms data timeout for commands with +* busy signal. +*/ +if (req->cmd->flags &MMC_RSP_BUSY ) +set_data_timeout (host,100000000U ,0 );return 0 ; }OMAP_HSMMC_WRITE (host->base,BLK , (req->data->blksz) | (req->data->blocks <<16 )); -set_data_timeout (host, req); +set_data_timeout (host, req->data->timeout_ns, req->data->timeout_clks);if (host->use_dma) { ret =omap_hsmmc_start_dma_transfer (host, req);
_