| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-Id: <20230217-topic-cpr3h-v12-7-1a4d050e1e67@linaro.org>
Date: Wed, 28 Jun 2023 16:00:46 +0200
From: Konrad Dybcio <konrad.dybcio@...aro.org>
To: AngeloGioacchino Del Regno
<angelogioacchino.delregno@...labora.com>,
Andy Gross <agross@...nel.org>,
Bjorn Andersson <andersson@...nel.org>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzysztof.kozlowski+dt@...aro.org>,
Viresh Kumar <vireshk@...nel.org>, Nishanth Menon <nm@...com>,
Stephen Boyd <sboyd@...nel.org>,
Niklas Cassel <nks@...wful.org>,
Liam Girdwood <lgirdwood@...il.com>,
Mark Brown <broonie@...nel.org>,
Conor Dooley <conor+dt@...nel.org>
Cc: Robert Marko <robimarko@...il.com>, linux-kernel@...r.kernel.org,
linux-arm-msm@...r.kernel.org, devicetree@...r.kernel.org,
linux-pm@...r.kernel.org, Jeffrey Hugo <quic_jhugo@...cinc.com>,
Marijn Suijten <marijn.suijten@...ainline.org>,
Konrad Dybcio <konrad.dybcio@...aro.org>
Subject: [PATCH v12 07/10] soc: qcom: cpr: Use u64 for frequency
32 bits is not enough for over-2.changeGHz frequencies. Move all variables
that operate on Hz to u64 to avoid overflows.
Signed-off-by: Konrad Dybcio <konrad.dybcio@...aro.org>
---
drivers/soc/qcom/cpr-common.c | 13 +++++++------
drivers/soc/qcom/cpr-common.h | 9 ++++-----
drivers/soc/qcom/cpr.c | 8 ++++----
3 files changed, 15 insertions(+), 15 deletions(-)
diff --git a/drivers/soc/qcom/cpr-common.c b/drivers/soc/qcom/cpr-common.c
index 44c681bbbf13..3e3a4a61cfde 100644
--- a/drivers/soc/qcom/cpr-common.c
+++ b/drivers/soc/qcom/cpr-common.c
@@ -218,7 +218,7 @@ unsigned int cpr_get_fuse_corner(struct dev_pm_opp *opp)
}
EXPORT_SYMBOL_GPL(cpr_get_fuse_corner);
-unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref,
+u64 cpr_get_opp_hz_for_req(struct dev_pm_opp *ref,
struct device *cpu_dev)
{
u64 rate = 0;
@@ -250,7 +250,7 @@ unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref,
out_ref:
of_node_put(desc_np);
- return (unsigned long) rate;
+ return rate;
}
EXPORT_SYMBOL_GPL(cpr_get_opp_hz_for_req);
@@ -260,7 +260,7 @@ int cpr_calculate_scaling(struct device *dev,
const struct corner *corner)
{
u32 quot_diff = 0;
- unsigned long freq_diff;
+ u64 freq_diff;
int scaling;
const struct fuse_corner *fuse, *prev_fuse;
int ret;
@@ -280,8 +280,9 @@ int cpr_calculate_scaling(struct device *dev,
}
freq_diff = fuse->max_freq - prev_fuse->max_freq;
- freq_diff /= 1000000; /* Convert to MHz */
- scaling = 1000 * quot_diff / freq_diff;
+ freq_diff = div_u64(freq_diff, 1000000); /* Convert to MHz */
+ scaling = 1000 * quot_diff;
+ do_div(scaling, freq_diff);
return min(scaling, fdata->max_quot_scale);
}
EXPORT_SYMBOL_GPL(cpr_calculate_scaling);
@@ -289,7 +290,7 @@ EXPORT_SYMBOL_GPL(cpr_calculate_scaling);
int cpr_interpolate(const struct corner *corner, int step_volt,
const struct fuse_corner_data *fdata)
{
- unsigned long f_high, f_low, f_diff;
+ u64 f_high, f_low, f_diff;
int uV_high, uV_low, uV;
u64 temp, temp_limit;
const struct fuse_corner *fuse, *prev_fuse;
diff --git a/drivers/soc/qcom/cpr-common.h b/drivers/soc/qcom/cpr-common.h
index 0aa227617d2f..1b2fa344eb09 100644
--- a/drivers/soc/qcom/cpr-common.h
+++ b/drivers/soc/qcom/cpr-common.h
@@ -42,7 +42,7 @@ struct fuse_corner {
int step_quot;
const struct reg_sequence *accs;
int num_accs;
- unsigned long max_freq;
+ u64 max_freq;
u8 ring_osc_idx;
};
@@ -54,13 +54,13 @@ struct corner {
int quot_adjust;
u32 save_ctl;
u32 save_irq;
- unsigned long freq;
+ u64 freq;
struct fuse_corner *fuse_corner;
};
struct corner_data {
unsigned int fuse_corner;
- unsigned long freq;
+ u64 freq;
};
struct acc_desc {
@@ -92,8 +92,7 @@ int cpr_populate_fuse_common(struct device *dev,
int cpr_find_initial_corner(struct device *dev, struct clk *cpu_clk,
struct corner *corners, int num_corners);
u32 cpr_get_fuse_corner(struct dev_pm_opp *opp);
-unsigned long cpr_get_opp_hz_for_req(struct dev_pm_opp *ref,
- struct device *cpu_dev);
+u64 cpr_get_opp_hz_for_req(struct dev_pm_opp *ref, struct device *cpu_dev);
int cpr_calculate_scaling(struct device *dev,
const char *quot_offset,
const struct fuse_corner_data *fdata,
diff --git a/drivers/soc/qcom/cpr.c b/drivers/soc/qcom/cpr.c
index cc1e4c462d1f..49c33b13b82b 100644
--- a/drivers/soc/qcom/cpr.c
+++ b/drivers/soc/qcom/cpr.c
@@ -827,8 +827,8 @@ static int cpr_corner_init(struct cpr_drv *drv)
struct corner_data *cdata;
const struct fuse_corner_data *fdata;
bool apply_scaling;
- unsigned long freq_diff, freq_diff_mhz;
- unsigned long freq;
+ unsigned long freq_diff_mhz;
+ u64 freq, freq_diff;
int step_volt = regulator_get_linear_step(drv->vdd_apc);
struct dev_pm_opp *opp;
@@ -867,7 +867,7 @@ static int cpr_corner_init(struct cpr_drv *drv)
cdata[level - 1].freq = freq;
fuse = &drv->fuse_corners[fnum];
- dev_dbg(drv->dev, "freq: %lu level: %u fuse level: %u\n",
+ dev_dbg(drv->dev, "freq: %llu level: %u fuse level: %u\n",
freq, dev_pm_opp_get_level(opp) - 1, fnum);
if (freq > fuse->max_freq)
fuse->max_freq = freq;
@@ -941,7 +941,7 @@ static int cpr_corner_init(struct cpr_drv *drv)
if (apply_scaling) {
freq_diff = fuse->max_freq - corner->freq;
- freq_diff_mhz = freq_diff / 1000000;
+ freq_diff_mhz = (u32)div_u64(freq_diff, 1000000);
corner->quot_adjust = scaling * freq_diff_mhz / 1000;
corner->uV = cpr_interpolate(corner, step_volt, fdata);
--
2.41.0
Powered by blists - more mailing lists