linux-omap.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Ravikumar Kattekola <rk@ti.com>
To: ulf.hansson@linaro.org, peter.ujfalusi@ti.com, nsekhar@ti.com,
	tony@atomide.com, afenkart@gmail.com, linux-mmc@vger.kernel.org,
	linux-omap@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: kishon@ti.com, rk@ti.com
Subject: [PATCH 3/3] mmc: host: omap_hsmmc: avoid possible overflow of timeout value
Date: Mon, 30 Jan 2017 15:41:58 +0530	[thread overview]
Message-ID: <1485771118-13748-4-git-send-email-rk@ti.com> (raw)
In-Reply-To: <1485771118-13748-1-git-send-email-rk@ti.com>

Fixes: a45c6cb81647 ("[ARM] 5369/1: omap mmc: Add new omap
hsmmc controller for 2430 and 34xx, v3")

when using really large timeout (up to 4*60*1000 ms for bkops)
there is a possibility of data overflow using
unsigned int so use 64 bit unsigned long long.

Signed-off-by: Ravikumar Kattekola <rk@ti.com>
Signed-off-by: Sekhar Nori <nsekhar@ti.com>
---
 drivers/mmc/host/omap_hsmmc.c | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/drivers/mmc/host/omap_hsmmc.c b/drivers/mmc/host/omap_hsmmc.c
index 51ca3d7..a58bd65 100644
--- a/drivers/mmc/host/omap_hsmmc.c
+++ b/drivers/mmc/host/omap_hsmmc.c
@@ -1469,10 +1469,11 @@ static int omap_hsmmc_setup_dma_transfer(struct omap_hsmmc_host *host,
 }
 
 static void set_data_timeout(struct omap_hsmmc_host *host,
-			     unsigned int timeout_ns,
+			     unsigned long long timeout_ns,
 			     unsigned int timeout_clks)
 {
-	unsigned int timeout, cycle_ns;
+	unsigned long long timeout = timeout_ns;
+	unsigned int cycle_ns;
 	uint32_t reg, clkd, dto = 0;
 
 	reg = OMAP_HSMMC_READ(host->base, SYSCTL);
@@ -1481,7 +1482,7 @@ static void set_data_timeout(struct omap_hsmmc_host *host,
 		clkd = 1;
 
 	cycle_ns = 1000000000 / (host->clk_rate / clkd);
-	timeout = timeout_ns / cycle_ns;
+	do_div(timeout, cycle_ns);
 	timeout += timeout_clks;
 	if (timeout) {
 		while ((timeout & 0x80000000) == 0) {
@@ -1527,7 +1528,7 @@ static void omap_hsmmc_start_dma_transfer(struct omap_hsmmc_host *host)
 omap_hsmmc_prepare_data(struct omap_hsmmc_host *host, struct mmc_request *req)
 {
 	int ret;
-	unsigned int timeout;
+	unsigned long long timeout;
 
 	host->data = req->data;
 
-- 
1.9.1

  parent reply	other threads:[~2017-01-30 10:11 UTC|newest]

Thread overview: 10+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2017-01-30 10:11 [PATCH 0/3] mmc: host: omap_hsmmc: miscellaneous fixes Ravikumar Kattekola
2017-01-30 10:11 ` [PATCH 1/3] mmc: host: omap_hsmmc: reset cmd line on ceb error Ravikumar Kattekola
2017-01-30 10:11 ` [PATCH 2/3] mmc: host: omap_hsmmc: use generic_cmd6_time to program timeout value for CMD6 Ravikumar Kattekola
2017-01-31 10:12   ` Ulf Hansson
2017-01-31 10:27     ` Ravikumar
2017-01-31 10:50       ` Ulf Hansson
2017-01-30 10:11 ` Ravikumar Kattekola [this message]
2017-01-31 10:15 ` [PATCH 0/3] mmc: host: omap_hsmmc: miscellaneous fixes Ulf Hansson
2017-01-31 10:34   ` Ravikumar
2017-01-31 10:51     ` Ulf Hansson

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1485771118-13748-4-git-send-email-rk@ti.com \
    --to=rk@ti.com \
    --cc=afenkart@gmail.com \
    --cc=kishon@ti.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-mmc@vger.kernel.org \
    --cc=linux-omap@vger.kernel.org \
    --cc=nsekhar@ti.com \
    --cc=peter.ujfalusi@ti.com \
    --cc=tony@atomide.com \
    --cc=ulf.hansson@linaro.org \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).