]> git.hungrycats.org Git - linux/commit
mmc: sdhci: fix data timeout (part 2)
authorRussell King <rmk+kernel@arm.linux.org.uk>
Tue, 26 Jan 2016 13:41:04 +0000 (13:41 +0000)
committerSasha Levin <sasha.levin@oracle.com>
Mon, 18 Apr 2016 12:50:42 +0000 (08:50 -0400)
commitd836abef23b662030fe8f5a2206d5274fe670155
tree4d6a7093c04f2e2bcd40884c4338b1985160c230
parent68c533586b56051041b35477691d649fb90951c4
mmc: sdhci: fix data timeout (part 2)

[ Upstream commit 7f05538af71c7d30b5fc821cbe9f318edc645961 ]

The calculation for the timeout based on the number of card clocks is
incorrect.  The calculation assumed:

timeout in microseconds = clock cycles / clock in Hz

which is clearly a several orders of magnitude wrong.  Fix this by
multiplying the clock cycles by 1000000 prior to dividing by the Hz
based clock.  Also, as per part 1, ensure that the division rounds
up.

As this needs 64-bit math via do_div(), avoid it if the clock cycles
is zero.

Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Signed-off-by: Adrian Hunter <adrian.hunter@intel.com>
Cc: stable@vger.kernel.org # v3.15+
Tested-by: Gregory CLEMENT <gregory.clement@free-electrons.com>
Signed-off-by: Ulf Hansson <ulf.hansson@linaro.org>
Signed-off-by: Sasha Levin <sasha.levin@oracle.com>
drivers/mmc/host/sdhci.c