From: Evgeniy Didin <Evgeniy.Didin@synopsys.com> To: linux-mmc@vger.kernel.org Cc: Alexey Brodkin <Alexey.Brodkin@synopsys.com>, Eugeniy Paltsev <Eugeniy.Paltsev@synopsys.com>, Douglas Anderson <dianders@chromium.org>, Ulf Hansson <ulf.hansson@linaro.org>, linux-kernel@vger.kernel.org, linux-snps-arc@lists.infradead.org, stable@vger.kernel.org, Vineet Gupta <Vineet.Gupta1@synopsys.com> Subject: [PATCH 2/2 v3] mmc: dw_mmc: Fix the CTO overflow calculation for 32-bit systems Date: Mon, 26 Feb 2018 17:34:13 +0300 [thread overview] Message-ID: <20180226143413.44134-3-Evgeniy.Didin@synopsys.com> (raw) In-Reply-To: <20180226143413.44134-1-Evgeniy.Didin@synopsys.com> In commit 4c2357f57dd5 ("mmc: dw_mmc: Fix the CTO timeout calculation") have been made changes which can cause multiply overflow for 32-bit systems. The value of cto_ms is lower the drto_ms, but nevertheless overflow can occur. Lets cast this multiply to u64 type which prevents overflow. Signed-off-by: Evgeniy Didin <Evgeniy.Didin@synopsys.com> CC: Alexey Brodkin <abrodkin@synopsys.com> CC: Eugeniy Paltsev <paltsev@synopsys.com> CC: Douglas Anderson <dianders@chromium.org> CC: Ulf Hansson <ulf.hansson@linaro.org> CC: linux-kernel@vger.kernel.org CC: linux-snps-arc@lists.infradead.org Cc: <stable@vger.kernel.org> # 4c2357f57dd5 mmc: dw_mmc: Fix the CTO timeout calculation --- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 194159219b32..775fb3ae1443 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -409,7 +409,8 @@ static inline void dw_mci_set_cto(struct dw_mci *host) cto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; if (cto_div == 0) cto_div = 1; - cto_ms = DIV_ROUND_UP(MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz); + + cto_ms = DIV_ROUND_UP((u64)MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz); /* add a bit spare time */ cto_ms += 10; -- 2.11.0
WARNING: multiple messages have this Message-ID (diff)
From: Evgeniy.Didin@synopsys.com (Evgeniy Didin) To: linux-snps-arc@lists.infradead.org Subject: [PATCH 2/2 v3] mmc: dw_mmc: Fix the CTO overflow calculation for 32-bit systems Date: Mon, 26 Feb 2018 17:34:13 +0300 [thread overview] Message-ID: <20180226143413.44134-3-Evgeniy.Didin@synopsys.com> (raw) In-Reply-To: <20180226143413.44134-1-Evgeniy.Didin@synopsys.com> In commit 4c2357f57dd5 ("mmc: dw_mmc: Fix the CTO timeout calculation") have been made changes which can cause multiply overflow for 32-bit systems. The value of cto_ms is lower the drto_ms, but nevertheless overflow can occur. Lets cast this multiply to u64 type which prevents overflow. Signed-off-by: Evgeniy Didin <Evgeniy.Didin at synopsys.com> CC: Alexey Brodkin <abrodkin at synopsys.com> CC: Eugeniy Paltsev <paltsev at synopsys.com> CC: Douglas Anderson <dianders at chromium.org> CC: Ulf Hansson <ulf.hansson at linaro.org> CC: linux-kernel at vger.kernel.org CC: linux-snps-arc at lists.infradead.org Cc: <stable at vger.kernel.org> # 4c2357f57dd5 mmc: dw_mmc: Fix the CTO timeout calculation --- drivers/mmc/host/dw_mmc.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/drivers/mmc/host/dw_mmc.c b/drivers/mmc/host/dw_mmc.c index 194159219b32..775fb3ae1443 100644 --- a/drivers/mmc/host/dw_mmc.c +++ b/drivers/mmc/host/dw_mmc.c @@ -409,7 +409,8 @@ static inline void dw_mci_set_cto(struct dw_mci *host) cto_div = (mci_readl(host, CLKDIV) & 0xff) * 2; if (cto_div == 0) cto_div = 1; - cto_ms = DIV_ROUND_UP(MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz); + + cto_ms = DIV_ROUND_UP((u64)MSEC_PER_SEC * cto_clks * cto_div, host->bus_hz); /* add a bit spare time */ cto_ms += 10; -- 2.11.0
next prev parent reply other threads:[~2018-02-26 14:34 UTC|newest] Thread overview: 36+ messages / expand[flat|nested] mbox.gz Atom feed top 2018-02-26 14:34 [PATCH 0/2 v3] mmc: dw_mmc: Fix DTO/STO timeout overflow calculation Evgeniy Didin 2018-02-26 14:34 ` Evgeniy Didin 2018-02-26 14:34 ` [PATCH 1/2 v3] mmc: dw_mmc: Fix the DTO timeout overflow calculation for 32-bit systems Evgeniy Didin 2018-02-26 14:34 ` Evgeniy Didin 2018-02-26 14:34 ` Evgeniy Didin 2018-02-26 14:40 ` Andy Shevchenko 2018-02-26 14:40 ` Andy Shevchenko 2018-02-27 1:14 ` Shawn Lin 2018-02-27 1:14 ` Shawn Lin 2018-02-27 1:46 ` Shawn Lin 2018-02-27 1:46 ` Shawn Lin 2018-03-01 1:22 ` kbuild test robot 2018-03-01 1:22 ` kbuild test robot 2018-02-26 14:34 ` Evgeniy Didin [this message] 2018-02-26 14:34 ` [PATCH 2/2 v3] mmc: dw_mmc: Fix the CTO " Evgeniy Didin 2018-02-26 14:39 ` Andy Shevchenko 2018-02-26 14:39 ` Andy Shevchenko 2018-02-26 15:14 ` Evgeniy Didin 2018-02-26 15:14 ` Evgeniy Didin 2018-02-26 15:14 ` Evgeniy Didin 2018-02-26 16:53 ` Andy Shevchenko 2018-02-26 16:53 ` Andy Shevchenko 2018-02-26 17:14 ` Evgeniy Didin 2018-02-26 17:14 ` Evgeniy Didin 2018-02-26 18:30 ` Andy Shevchenko 2018-02-26 18:30 ` Andy Shevchenko 2018-02-26 20:27 ` Alexey Brodkin 2018-02-26 20:27 ` Alexey Brodkin 2018-02-26 20:27 ` Alexey Brodkin 2018-02-27 3:52 ` Jisheng Zhang 2018-02-27 3:52 ` Jisheng Zhang 2018-02-27 10:49 ` Andy Shevchenko 2018-02-27 10:49 ` Andy Shevchenko 2018-02-27 3:02 ` [PATCH 0/2 v3] mmc: dw_mmc: Fix DTO/STO timeout overflow calculation Jisheng Zhang 2018-02-27 3:02 ` Jisheng Zhang 2018-02-27 3:02 ` Jisheng Zhang
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=20180226143413.44134-3-Evgeniy.Didin@synopsys.com \ --to=evgeniy.didin@synopsys.com \ --cc=Alexey.Brodkin@synopsys.com \ --cc=Eugeniy.Paltsev@synopsys.com \ --cc=Vineet.Gupta1@synopsys.com \ --cc=dianders@chromium.org \ --cc=linux-kernel@vger.kernel.org \ --cc=linux-mmc@vger.kernel.org \ --cc=linux-snps-arc@lists.infradead.org \ --cc=stable@vger.kernel.org \ --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: linkBe sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes, see mirroring instructions on how to clone and mirror all data and code used by this external index.