clk: scpi: fix return type of __scpi_dvfs_round_rate

Message ID 1495124368-26191-1-git-send-email-sudeep.holla@arm.com
State Accepted
Commit 7374aec95636ca39409545eba4ef5ff3125c2346
Headers show

Commit Message

Sudeep Holla May 18, 2017, 4:19 p.m.
The frequencies above the maximum value of signed integer(i.e. 2^31 -1)
will overflow with the current code.

This patch fixes the return type of __scpi_dvfs_round_rate from 'int'
to 'unsigned long'.

Fixes: cd52c2a4b5c4 ("clk: add support for clocks provided by SCP(System Control Processor)")
Cc: Michael Turquette <mturquette@baylibre.com>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

---
 drivers/clk/clk-scpi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

Hi,

Sorry for the stupid bug, just noticed the issue running on software
models with the frequency of 2.4 GHz. Not noticed so far as never ran
this on a system above 1.2 GHz so far :(

Regards,
Sudeep

--
2.7.4

Comments

Stephen Boyd June 1, 2017, 9:13 a.m. | #1
On 05/18, Sudeep Holla wrote:
> The frequencies above the maximum value of signed integer(i.e. 2^31 -1)

> will overflow with the current code.

> 

> This patch fixes the return type of __scpi_dvfs_round_rate from 'int'

> to 'unsigned long'.

> 

> Fixes: cd52c2a4b5c4 ("clk: add support for clocks provided by SCP(System Control Processor)")

> Cc: Michael Turquette <mturquette@baylibre.com>

> Cc: Stephen Boyd <sboyd@codeaurora.org>

> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com>

> ---


Applied to clk-next

-- 
Qualcomm Innovation Center, Inc. is a member of Code Aurora Forum,
a Linux Foundation Collaborative Project

Patch hide | download patch | download mbox

diff --git a/drivers/clk/clk-scpi.c b/drivers/clk/clk-scpi.c
index 96d37175d0ad..8ad458b5ad6e 100644
--- a/drivers/clk/clk-scpi.c
+++ b/drivers/clk/clk-scpi.c
@@ -71,15 +71,15 @@  static const struct clk_ops scpi_clk_ops = {
 };

 /* find closest match to given frequency in OPP table */
-static int __scpi_dvfs_round_rate(struct scpi_clk *clk, unsigned long rate)
+static long __scpi_dvfs_round_rate(struct scpi_clk *clk, unsigned long rate)
 {
 	int idx;
-	u32 fmin = 0, fmax = ~0, ftmp;
+	unsigned long fmin = 0, fmax = ~0, ftmp;
 	const struct scpi_opp *opp = clk->info->opps;

 	for (idx = 0; idx < clk->info->count; idx++, opp++) {
 		ftmp = opp->freq;
-		if (ftmp >= (u32)rate) {
+		if (ftmp >= rate) {
 			if (ftmp <= fmax)
 				fmax = ftmp;
 			break;