mmc: dw_mmc: fix timeout calculate method

There are two cases not been considered:
- use uint for timeout, it will overflow when size bigger than 512KB for
  it *8*1000 at the beginning, but we may use size up to 32MB; The
  'timeout' will overflow if size bigger than 51.2MB after this fix, which
  should be enough for U-Boot;
- The timeout is using clock speed for data rate, but the device may not
  have such high speed, eg. clock is 52MHz while the device write speed may
  be less than 10MB/s, and we may use up to 150MHz clock.

Fix them in this patch, the max timeout is about 6500 when size is 32MB
after fix.

Signed-off-by: Kever Yang <kever.yang@rock-chips.com>

diff --git a/drivers/mmc/dw_mmc.c b/drivers/mmc/dw_mmc.c
index 22f6c7eefdf0519b6ce9dfa5e17652080225167e..ebe7bcdd900591f80b26b2558b7f31110764ed09 100644 (file)
--- a/drivers/mmc/dw_mmc.c
+++ b/drivers/mmc/dw_mmc.c
@@ -119,11 +119,12 @@ static unsigned int dwmci_get_timeout(struct mmc *mmc, const unsigned int size)
 {
        unsigned int timeout;
 
-       timeout = size * 8 * 1000;      /* counting in bits and msec */
-       timeout *= 2;                   /* wait twice as long */
+       timeout = size * 8;     /* counting in bits */
+       timeout *= 10;          /* wait 10 times as long */
        timeout /= mmc->clock;
        timeout /= mmc->bus_width;
        timeout /= mmc->ddr_mode ? 2 : 1;
+       timeout *= 1000;        /* counting in msec */
        timeout = (timeout < 1000) ? 1000 : timeout;
 
        return timeout;