From: jbrunet@baylibre.com (Jerome Brunet)
To: linus-amlogic@lists.infradead.org
Subject: [PATCH 2/2] clk: meson: mpll: use 64bit math in rate_from_params
Date: Sun, 02 Apr 2017 17:09:10 +0200 [thread overview]
Message-ID: <1491145750.3480.3.camel@baylibre.com> (raw)
In-Reply-To: <20170401130225.8811-3-martin.blumenstingl@googlemail.com>
On Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:
> On Meson8b the MPLL parent clock (fixed_pll) has a rate of 2550MHz.
> Multiplying this with SDM_DEN results in a value greater than 32bits.
> This is not a problem on the 64bit Meson GX SoCs, but it may result in
> undefined behavior on the older 32bit Meson8b SoC.
>
> While rate_from_params was only introduced recently to make the math
> reusable from _round_rate and _recalc_rate the original bug exists much
> longer.
Again, thanks for testing and fixing this Martin !
>
> Fixes: 1c50da4f27 ("clk: meson: add mpll support")
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> ---
> ?drivers/clk/meson/clk-mpll.c | 3 ++-
> ?1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c
> index 551aa2a5b291..4306ad833a4f 100644
> --- a/drivers/clk/meson/clk-mpll.c
> +++ b/drivers/clk/meson/clk-mpll.c
> @@ -62,6 +62,7 @@
> ? */
> ?
> ?#include <linux/clk-provider.h>
> +#include <linux/math64.h>
> ?#include "clkc.h"
> ?
> ?#define SDM_DEN 16384
> @@ -81,7 +82,7 @@ static unsigned long rate_from_params(unsigned long
> parent_rate,
> ? if (divisor == 0)
> ? return 0;
> ? else
> - return (parent_rate * SDM_DEN) / divisor;
> + return mul_u64_u32_div(parent_rate, SDM_DEN, divisor);
Just casting parent_rate to u64 should be enough, don't you think ?
Actually, I was thinking of copying a pattern that is used a lot in CCF and use
DIV_ROUND_UP_ULL((u64)foo, bar). See clk-divider.c.
Would this be ok with you ?
> ?}
> ?
> ?static void params_from_rate(unsigned long requested_rate,
WARNING: multiple messages have this Message-ID (diff)
From: Jerome Brunet <jbrunet@baylibre.com>
To: Martin Blumenstingl <martin.blumenstingl@googlemail.com>,
linux-amlogic@lists.infradead.org, linux-clk@vger.kernel.org
Cc: linux-arm-kernel@lists.infradead.org, khilman@baylibre.com,
carlo@caione.org, sboyd@codeaurora.org, mturquette@baylibre.com,
narmstrong@baylibre.com
Subject: Re: [PATCH 2/2] clk: meson: mpll: use 64bit math in rate_from_params
Date: Sun, 02 Apr 2017 17:09:10 +0200 [thread overview]
Message-ID: <1491145750.3480.3.camel@baylibre.com> (raw)
In-Reply-To: <20170401130225.8811-3-martin.blumenstingl@googlemail.com>
On Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:
> On Meson8b the MPLL parent clock (fixed_pll) has a rate of 2550MHz.
> Multiplying this with SDM_DEN results in a value greater than 32bits.
> This is not a problem on the 64bit Meson GX SoCs, but it may result in
> undefined behavior on the older 32bit Meson8b SoC.
>
> While rate_from_params was only introduced recently to make the math
> reusable from _round_rate and _recalc_rate the original bug exists much
> longer.
Again, thanks for testing and fixing this Martin !
>
> Fixes: 1c50da4f27 ("clk: meson: add mpll support")
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> ---
> drivers/clk/meson/clk-mpll.c | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c
> index 551aa2a5b291..4306ad833a4f 100644
> --- a/drivers/clk/meson/clk-mpll.c
> +++ b/drivers/clk/meson/clk-mpll.c
> @@ -62,6 +62,7 @@
> */
>
> #include <linux/clk-provider.h>
> +#include <linux/math64.h>
> #include "clkc.h"
>
> #define SDM_DEN 16384
> @@ -81,7 +82,7 @@ static unsigned long rate_from_params(unsigned long
> parent_rate,
> if (divisor == 0)
> return 0;
> else
> - return (parent_rate * SDM_DEN) / divisor;
> + return mul_u64_u32_div(parent_rate, SDM_DEN, divisor);
Just casting parent_rate to u64 should be enough, don't you think ?
Actually, I was thinking of copying a pattern that is used a lot in CCF and use
DIV_ROUND_UP_ULL((u64)foo, bar). See clk-divider.c.
Would this be ok with you ?
> }
>
> static void params_from_rate(unsigned long requested_rate,
WARNING: multiple messages have this Message-ID (diff)
From: jbrunet@baylibre.com (Jerome Brunet)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 2/2] clk: meson: mpll: use 64bit math in rate_from_params
Date: Sun, 02 Apr 2017 17:09:10 +0200 [thread overview]
Message-ID: <1491145750.3480.3.camel@baylibre.com> (raw)
In-Reply-To: <20170401130225.8811-3-martin.blumenstingl@googlemail.com>
On Sat, 2017-04-01 at 15:02 +0200, Martin Blumenstingl wrote:
> On Meson8b the MPLL parent clock (fixed_pll) has a rate of 2550MHz.
> Multiplying this with SDM_DEN results in a value greater than 32bits.
> This is not a problem on the 64bit Meson GX SoCs, but it may result in
> undefined behavior on the older 32bit Meson8b SoC.
>
> While rate_from_params was only introduced recently to make the math
> reusable from _round_rate and _recalc_rate the original bug exists much
> longer.
Again, thanks for testing and fixing this Martin !
>
> Fixes: 1c50da4f27 ("clk: meson: add mpll support")
> Signed-off-by: Martin Blumenstingl <martin.blumenstingl@googlemail.com>
> ---
> ?drivers/clk/meson/clk-mpll.c | 3 ++-
> ?1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/drivers/clk/meson/clk-mpll.c b/drivers/clk/meson/clk-mpll.c
> index 551aa2a5b291..4306ad833a4f 100644
> --- a/drivers/clk/meson/clk-mpll.c
> +++ b/drivers/clk/meson/clk-mpll.c
> @@ -62,6 +62,7 @@
> ? */
> ?
> ?#include <linux/clk-provider.h>
> +#include <linux/math64.h>
> ?#include "clkc.h"
> ?
> ?#define SDM_DEN 16384
> @@ -81,7 +82,7 @@ static unsigned long rate_from_params(unsigned long
> parent_rate,
> ? if (divisor == 0)
> ? return 0;
> ? else
> - return (parent_rate * SDM_DEN) / divisor;
> + return mul_u64_u32_div(parent_rate, SDM_DEN, divisor);
Just casting parent_rate to u64 should be enough, don't you think ?
Actually, I was thinking of copying a pattern that is used a lot in CCF and use
DIV_ROUND_UP_ULL((u64)foo, bar). See clk-divider.c.
Would this be ok with you ?
> ?}
> ?
> ?static void params_from_rate(unsigned long requested_rate,
next prev parent reply other threads:[~2017-04-02 15:09 UTC|newest]
Thread overview: 27+ messages / expand[flat|nested] mbox.gz Atom feed top
2017-04-01 13:02 [PATCH 0/2] clk: meson: MPLL fixes for Meson8b Martin Blumenstingl
2017-04-01 13:02 ` Martin Blumenstingl
2017-04-01 13:02 ` Martin Blumenstingl
2017-04-01 13:02 ` [PATCH 1/2] clk: meson: mpll: fix division by zero in rate_from_params Martin Blumenstingl
2017-04-01 13:02 ` Martin Blumenstingl
2017-04-01 13:02 ` Martin Blumenstingl
2017-04-02 14:49 ` Jerome Brunet
2017-04-02 14:49 ` Jerome Brunet
2017-04-02 14:49 ` Jerome Brunet
2017-04-02 18:43 ` Martin Blumenstingl
2017-04-02 18:43 ` Martin Blumenstingl
2017-04-02 18:43 ` Martin Blumenstingl
2017-04-02 21:34 ` Jerome Brunet
2017-04-02 21:34 ` Jerome Brunet
2017-04-02 21:34 ` Jerome Brunet
2017-04-07 15:12 ` Jerome Brunet
2017-04-07 15:12 ` Jerome Brunet
2017-04-07 15:12 ` Jerome Brunet
2017-04-01 13:02 ` [PATCH 2/2] clk: meson: mpll: use 64bit math " Martin Blumenstingl
2017-04-01 13:02 ` Martin Blumenstingl
2017-04-01 13:02 ` Martin Blumenstingl
2017-04-02 15:09 ` Jerome Brunet [this message]
2017-04-02 15:09 ` Jerome Brunet
2017-04-02 15:09 ` Jerome Brunet
2017-04-02 18:46 ` Martin Blumenstingl
2017-04-02 18:46 ` Martin Blumenstingl
2017-04-02 18:46 ` Martin Blumenstingl
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=1491145750.3480.3.camel@baylibre.com \
--to=jbrunet@baylibre.com \
--cc=linus-amlogic@lists.infradead.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 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.