diff options
| author | Ludovic Desroches <ludovic.desroches@atmel.com> | 2012-03-28 12:28:33 +0200 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-04-13 08:33:49 -0700 |
| commit | bd4a0cb6f12b87c701f25519acb89308321023d9 (patch) | |
| tree | 1cb87084c18cbc82c99f90dc430d3d5621493d9d /drivers/mmc | |
| parent | 1a042a419c438247391b0943092541de662ca683 (diff) | |
| download | kernel_samsung_smdk4412-bd4a0cb6f12b87c701f25519acb89308321023d9.zip kernel_samsung_smdk4412-bd4a0cb6f12b87c701f25519acb89308321023d9.tar.gz kernel_samsung_smdk4412-bd4a0cb6f12b87c701f25519acb89308321023d9.tar.bz2 | |
mmc: atmel-mci: correct data timeout computation
commit 66292ad92c6d3f2f1c137a1c826b331ca8595dfd upstream.
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>
Signed-off-by: Chris Ball <cjb@laptop.org>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'drivers/mmc')
| -rw-r--r-- | drivers/mmc/host/atmel-mci.c | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/drivers/mmc/host/atmel-mci.c b/drivers/mmc/host/atmel-mci.c index 9896933..0932024 100644 --- a/drivers/mmc/host/atmel-mci.c +++ b/drivers/mmc/host/atmel-mci.c @@ -480,7 +480,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, |