diff options
| author | Georgi Djakov <georgi.djakov@linaro.org> | 2015-09-08 11:24:41 +0300 |
|---|---|---|
| committer | Srinivas Kandagatla <srinivas.kandagatla@linaro.org> | 2016-05-17 18:03:05 +0100 |
| commit | f82667f1f95319be5284c939d40298a02d7f075c (patch) | |
| tree | 56d79b110a5205e6987be378924122d5b4119c57 | |
| parent | de53fc45c31b4d64195ba659360b6c31591b0ac7 (diff) | |
cpufreq-dt: Add L2 frequency scaling support
Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
| -rw-r--r-- | drivers/cpufreq/cpufreq-dt.c | 42 | ||||
| -rw-r--r-- | include/linux/cpufreq.h | 2 |
2 files changed, 43 insertions, 1 deletions
diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c index 6766b27befa4..f1af02949abe 100644 --- a/drivers/cpufreq/cpufreq-dt.c +++ b/drivers/cpufreq/cpufreq-dt.c @@ -46,11 +46,41 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index) struct private_data *priv = policy->driver_data; int ret; unsigned long target_freq = policy->freq_table[index].frequency * 1000; + struct clk *l2_clk = policy->l2_clk; + unsigned int l2_freq; + unsigned long new_l2_freq = 0; mutex_lock(&priv->lock); ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq); - if (!ret) + + if (!ret) { + if (!IS_ERR(l2_clk) && policy->l2_rate[0] && policy->l2_rate[1] && + policy->l2_rate[2]) { + static unsigned long krait_l2[CONFIG_NR_CPUS] = { }; + int cpu, ret = 0; + + if (target_freq >= policy->l2_rate[2]) + new_l2_freq = policy->l2_rate[2]; + else if (target_freq >= policy->l2_rate[1]) + new_l2_freq = policy->l2_rate[1]; + else + new_l2_freq = policy->l2_rate[0]; + + krait_l2[policy->cpu] = new_l2_freq; + for_each_present_cpu(cpu) + new_l2_freq = max(new_l2_freq, krait_l2[cpu]); + + l2_freq = clk_get_rate(l2_clk); + + if (l2_freq != new_l2_freq) { + /* scale l2 with the core */ + ret = clk_set_rate(l2_clk, new_l2_freq); + } + } + priv->opp_freq = target_freq; + } + mutex_unlock(&priv->lock); return ret; @@ -117,6 +147,7 @@ static int opp_notifier(struct notifier_block *nb, unsigned long event, mutex_lock(&priv->lock); if (freq == priv->opp_freq) { ret = regulator_set_voltage_triplet(cpu_reg, volt, volt, volt); + } mutex_unlock(&priv->lock); if (ret) @@ -194,6 +225,8 @@ static int cpufreq_init(struct cpufreq_policy *policy) const char *name; int ret; struct srcu_notifier_head *opp_srcu_head; + struct device_node *l2_np; + struct clk *l2_clk = NULL; cpu_dev = get_cpu_device(policy->cpu); if (!cpu_dev) { @@ -314,6 +347,13 @@ static int cpufreq_init(struct cpufreq_policy *policy) policy->suspend_freq = dev_pm_opp_get_freq(suspend_opp) / 1000; rcu_read_unlock(); + l2_clk = clk_get(cpu_dev, "l2"); + if (!IS_ERR(l2_clk)) + policy->l2_clk = l2_clk; + l2_np = of_find_node_by_name(NULL, "qcom,l2"); + if (l2_np) + of_property_read_u32_array(l2_np, "qcom,l2-rates", policy->l2_rate, 3); + ret = cpufreq_table_validate_and_show(policy, freq_table); if (ret) { dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__, diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h index 718e8725de8a..da1ebdfe3d61 100644 --- a/include/linux/cpufreq.h +++ b/include/linux/cpufreq.h @@ -67,6 +67,8 @@ struct cpufreq_policy { unsigned int cpu; /* cpu managing this policy, must be online */ struct clk *clk; + struct clk *l2_clk; /* L2 clock */ + unsigned int l2_rate[3]; /* L2 bus clock rate thresholds */ struct cpufreq_cpuinfo cpuinfo;/* see above */ unsigned int min; /* in kHz */ |