clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies
Subsystems (3)
PATCH v2 1/1 clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies
If the parent clock rate is greater than unsigned long max/2 then integer overflow happens when calculating the clock rate on 32-bit systems. As RCG2 uses half integer dividers, the clock rate is first being multiplied by 2 which will overflow the unsigned long max value. Hence, replace the common pattern of doing 64-bit multiplication and then a do_div() call with simpler mult_frac call.
---
Changes in V2:
- Replaced 64-bit multiplication & a do_div call with mult_frac call as suggested by Marijn Suijten.
- Updated the subject title
- Added Fixes tag
- Did not pick up the R-b tag due to the above changes.
drivers/clk/qcom/clk-rcg2.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)
drivers/clk/qcom/clk-rcg2.c +2 -6
@@ -159,15 +159,11 @@ static unsigned long calc_rate(unsigned long rate, u32 m, u32 n, u32 mode, u32 hid_div) {if (hid_div) { - rate *=2 ; - rate /= hid_div +1 ; + rate =mult_frac (rate,2 , hid_div +1 ); }if (mode) { -u64 tmp = rate; - tmp *= m; -do_div (tmp, n); - rate = tmp; + rate =mult_frac (rate, m, n); }return rate;
Signature · 1 line
2.34.1
Quoted 5 lines · Devi Priya
If the parent clock rate is greater than unsigned long max/2 then integer overflow happens when calculating the clock rate on 32-bit systems. As RCG2 uses half integer dividers, the clock rate is first being multiplied by 2 which will overflow the unsigned long max value. Hence, replace the common pattern of doing 64-bit multiplication
Wasn't it doing 32-bit multiplication on 32-bit systems? Glad to see the u64 mul and div cleaned up in the if (mode) block either way though.
Quoted 1 line
and then a
do_div()call with simplermult_fraccall.
mul_frac()
Quoted 7 lines
Fixes bcd61c0f535a ("clk: qcom: Add support for root clock generators (RCGs)")Signed-off-by Devi Priya <[email protected]>---
Changes in V2:
- Replaced 64-bit multiplication & ado_divcall withmult_fraccall as suggested by Marijn Suijten.
Don't forget to add reviewers to CC on followup revisions :)
Quoted 32 lines
- Updated the subject title
- Added Fixes tag
- Did not pick up the R-b tag due to the above changes.drivers/clk/qcom/clk-rcg2.c | 8 ++------ 1 file changed, 2 insertions(+), 6 deletions(-)drivers/clk/qcom/clk-rcg2.c +2
-6@@ -159,15 +159,11 @@ static unsigned long calc_rate(unsigned long rate, u32 m, u32 n, u32 mode, u32 hid_div) {if (hid_div) { - rate *=2 ; - rate /= hid_div +1 ; + rate =mult_frac (rate,2 , hid_div +1 ); }if (mode) { -u64 tmp = rate; - tmp *= m; -do_div (tmp, n); - rate = tmp; + rate =mult_frac (rate, m, n); }return rate;Signature · 1 line
2.34.1
Quoted 8 lines · Devi Priya
If the parent clock rate is greater than unsigned long max/2 then integer overflow happens when calculating the clock rate on 32-bit systems. As RCG2 uses half integer dividers, the clock rate is first being multiplied by 2 which will overflow the unsigned long max value. Hence, replace the common pattern of doing 64-bit multiplication and then a
do_div()call with simplermult_fraccall.[...]
Applied, thanks!
[1/1] clk: qcom: clk-rcg2: Fix clock rate overflow for high parent frequencies
commit: f7b7d30158cff246667273bd2a62fc93ee0725d2
Best regards,
Signature · 1 line
Bjorn Andersson <[email protected]>