mmc: atmel-mci: correct data timeout computation
authorLudovic Desroches <ludovic.desroches@atmel.com>
Wed, 28 Mar 2012 10:28:33 +0000 (12:28 +0200)
committerChris Ball <cjb@laptop.org>
Fri, 6 Apr 2012 00:32:21 +0000 (20:32 -0400)
The HSMCI operates at a rate of up to Master Clock divided by two.
Moreover previous calculation can cause overflows and so wrong
timeouts.

Signed-off-by: Ludovic Desroches <ludovic.desroches@atmel.com>
Acked-by: Nicolas Ferre <nicolas.ferre@atmel.com>
Cc: <stable@vger.kernel.org>
Signed-off-by: Chris Ball <cjb@laptop.org>
drivers/mmc/host/atmel-mci.c

index 9819dc09ce08d24f7bd2924fd35d786cc013b0ac..34080f590f69441be48dc419748596215aa82918 100644 (file)
@@ -482,7 +482,14 @@ err:
 static inline unsigned int atmci_ns_to_clocks(struct atmel_mci *host,
                                        unsigned int ns)
 {
-       return (ns * (host->bus_hz / 1000000) + 999) / 1000;
+       /*
+        * It is easier here to use us instead of ns for the timeout,
+        * it prevents from overflows during calculation.
+        */
+       unsigned int us = DIV_ROUND_UP(ns, 1000);
+
+       /* Maximum clock frequency is host->bus_hz/2 */
+       return us * (DIV_ROUND_UP(host->bus_hz, 2000000));
 }
 
 static void atmci_set_timeout(struct atmel_mci *host,