ipq: more v4.9 fixes
[openwrt/staging/blogic.git] / target / linux / ipq806x / patches-4.9 / 0055-cpufreq-dt-Add-L2-frequency-scaling-support.patch
1 From 0759cdff49f1cf361bf503c13f7bcb33da43ab95 Mon Sep 17 00:00:00 2001
2 From: Georgi Djakov <georgi.djakov@linaro.org>
3 Date: Tue, 8 Sep 2015 11:24:41 +0300
4 Subject: [PATCH 55/69] cpufreq-dt: Add L2 frequency scaling support
5
6 Signed-off-by: Georgi Djakov <georgi.djakov@linaro.org>
7 ---
8 drivers/cpufreq/cpufreq-dt.c | 41 ++++++++++++++++++++++++++++++++++++++++-
9 include/linux/cpufreq.h | 2 ++
10 2 files changed, 42 insertions(+), 1 deletion(-)
11
12 diff --git a/drivers/cpufreq/cpufreq-dt.c b/drivers/cpufreq/cpufreq-dt.c
13 index 058f08edf315..438722c9429a 100644
14 --- a/drivers/cpufreq/cpufreq-dt.c
15 +++ b/drivers/cpufreq/cpufreq-dt.c
16 @@ -48,11 +48,41 @@ static int set_target(struct cpufreq_policy *policy, unsigned int index)
17 struct private_data *priv = policy->driver_data;
18 int ret;
19 unsigned long target_freq = policy->freq_table[index].frequency * 1000;
20 + struct clk *l2_clk = policy->l2_clk;
21 + unsigned int l2_freq;
22 + unsigned long new_l2_freq = 0;
23
24 mutex_lock(&priv->lock);
25 ret = dev_pm_opp_set_rate(priv->cpu_dev, target_freq);
26 - if (!ret)
27 +
28 + if (!ret) {
29 + if (!IS_ERR(l2_clk) && policy->l2_rate[0] && policy->l2_rate[1] &&
30 + policy->l2_rate[2]) {
31 + static unsigned long krait_l2[CONFIG_NR_CPUS] = { };
32 + int cpu, ret = 0;
33 +
34 + if (target_freq >= policy->l2_rate[2])
35 + new_l2_freq = policy->l2_rate[2];
36 + else if (target_freq >= policy->l2_rate[1])
37 + new_l2_freq = policy->l2_rate[1];
38 + else
39 + new_l2_freq = policy->l2_rate[0];
40 +
41 + krait_l2[policy->cpu] = new_l2_freq;
42 + for_each_present_cpu(cpu)
43 + new_l2_freq = max(new_l2_freq, krait_l2[cpu]);
44 +
45 + l2_freq = clk_get_rate(l2_clk);
46 +
47 + if (l2_freq != new_l2_freq) {
48 + /* scale l2 with the core */
49 + ret = clk_set_rate(l2_clk, new_l2_freq);
50 + }
51 + }
52 +
53 priv->opp_freq = target_freq;
54 + }
55 +
56 mutex_unlock(&priv->lock);
57
58 return ret;
59 @@ -197,6 +227,8 @@ static int cpufreq_init(struct cpufreq_policy *policy)
60 const char *name;
61 int ret;
62 struct srcu_notifier_head *opp_srcu_head;
63 + struct device_node *l2_np;
64 + struct clk *l2_clk = NULL;
65
66 cpu_dev = get_cpu_device(policy->cpu);
67 if (!cpu_dev) {
68 @@ -318,6 +350,13 @@ static int cpufreq_init(struct cpufreq_policy *policy)
69 policy->suspend_freq = dev_pm_opp_get_freq(suspend_opp) / 1000;
70 rcu_read_unlock();
71
72 + l2_clk = clk_get(cpu_dev, "l2");
73 + if (!IS_ERR(l2_clk))
74 + policy->l2_clk = l2_clk;
75 + l2_np = of_find_node_by_name(NULL, "qcom,l2");
76 + if (l2_np)
77 + of_property_read_u32_array(l2_np, "qcom,l2-rates", policy->l2_rate, 3);
78 +
79 ret = cpufreq_table_validate_and_show(policy, freq_table);
80 if (ret) {
81 dev_err(cpu_dev, "%s: invalid frequency table: %d\n", __func__,
82 diff --git a/include/linux/cpufreq.h b/include/linux/cpufreq.h
83 index 32dc0cbd51ca..9c0a4b5e32ba 100644
84 --- a/include/linux/cpufreq.h
85 +++ b/include/linux/cpufreq.h
86 @@ -73,6 +73,8 @@ struct cpufreq_policy {
87 unsigned int cpu; /* cpu managing this policy, must be online */
88
89 struct clk *clk;
90 + struct clk *l2_clk; /* L2 clock */
91 + unsigned int l2_rate[3]; /* L2 bus clock rate thresholds */
92 struct cpufreq_cpuinfo cpuinfo;/* see above */
93
94 unsigned int min; /* in kHz */
95 --
96 2.11.0
97