| Message ID | 2c310ea534ac3cc181937bc8adf87c4695d6eb70.1400670427.git.viresh.kumar@linaro.org |
|---|---|
| State | New |
| Headers | show |
On Wed, May 21, 2014 at 4:40 PM, Viresh Kumar <viresh.kumar@linaro.org> wrote: > OPP tables are already initialized for all CPUs by cpufreq core and so we don't > need to reinitialize them from arm_big_little_dt driver. > I guess you wanted to say "cpu core code" instead of "cpufreq core". Correction may be needed here and in the subsequent patches as well. > Also, as the arm_big_little_dt driver doesn't have a .init_opp_table() callback > anymore, make it optional in arm_big_little driver. > > Cc: Sudeep Holla <sudeep.holla@arm.com> > Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> > --- > drivers/cpufreq/arm_big_little.c | 12 +++++++----- > drivers/cpufreq/arm_big_little_dt.c | 18 ------------------ > 2 files changed, 7 insertions(+), 23 deletions(-) > > diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c > index 1f4d4e3..561261e 100644 > --- a/drivers/cpufreq/arm_big_little.c > +++ b/drivers/cpufreq/arm_big_little.c > @@ -325,11 +325,13 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev) > if (freq_table[cluster]) > return 0; > > - ret = arm_bL_ops->init_opp_table(cpu_dev); > - if (ret) { > - dev_err(cpu_dev, "%s: init_opp_table failed, cpu: %d, err: %d\n", > + if (arm_bL_ops->init_opp_table) { > + ret = arm_bL_ops->init_opp_table(cpu_dev); > + if (ret) { > + dev_err(cpu_dev, "%s: init_opp_table failed, cpu: %d, err: %d\n", > __func__, cpu_dev->id, ret); > - goto out; > + goto out; > + } > } > > ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table[cluster]); > @@ -542,7 +544,7 @@ int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) > return -EBUSY; > } > > - if (!ops || !strlen(ops->name) || !ops->init_opp_table) { > + if (!ops || !strlen(ops->name)) { > pr_err("%s: Invalid arm_bL_ops, exiting\n", __func__); > return -ENODEV; > } > diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c > index 8d9d591..502182d 100644 > --- a/drivers/cpufreq/arm_big_little_dt.c > +++ b/drivers/cpufreq/arm_big_little_dt.c > @@ -43,23 +43,6 @@ static struct device_node *get_cpu_node_with_valid_op(int cpu) > return np; > } > > -static int dt_init_opp_table(struct device *cpu_dev) > -{ > - struct device_node *np; > - int ret; > - > - np = of_node_get(cpu_dev->of_node); > - if (!np) { > - pr_err("failed to find cpu%d node\n", cpu_dev->id); > - return -ENOENT; > - } > - > - ret = of_init_opp_table(cpu_dev); > - of_node_put(np); > - > - return ret; > -} > - > static int dt_get_transition_latency(struct device *cpu_dev) > { > struct device_node *np; > @@ -81,7 +64,6 @@ static int dt_get_transition_latency(struct device *cpu_dev) > static struct cpufreq_arm_bL_ops dt_bL_ops = { > .name = "dt-bl", > .get_transition_latency = dt_get_transition_latency, > - .init_opp_table = dt_init_opp_table, > }; > > static int generic_bL_probe(struct platform_device *pdev) > -- > 2.0.0.rc2 > > -- > To unsubscribe from this list: send the line "unsubscribe linux-pm" in > the body of a message to majordomo@vger.kernel.org > More majordomo info at http://vger.kernel.org/majordomo-info.html -- To unsubscribe from this list: send the line "unsubscribe linux-pm" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html
On 21 May 2014 17:05, Inderpal Singh <inderpal.s@samsung.com> wrote: > I guess you wanted to say "cpu core code" instead of "cpufreq core". > Correction may be needed here and in the subsequent patches as well. When I started implementation, I added code to cpufreq core's init routine and later moved it to base/cpu.c .. And just forgot to update it later :( Thanks for letting me know -- To unsubscribe from this list: send the line "unsubscribe linux-kernel" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html Please read the FAQ at http://www.tux.org/lkml/
diff --git a/drivers/cpufreq/arm_big_little.c b/drivers/cpufreq/arm_big_little.c index 1f4d4e3..561261e 100644 --- a/drivers/cpufreq/arm_big_little.c +++ b/drivers/cpufreq/arm_big_little.c @@ -325,11 +325,13 @@ static int _get_cluster_clk_and_freq_table(struct device *cpu_dev) if (freq_table[cluster]) return 0; - ret = arm_bL_ops->init_opp_table(cpu_dev); - if (ret) { - dev_err(cpu_dev, "%s: init_opp_table failed, cpu: %d, err: %d\n", + if (arm_bL_ops->init_opp_table) { + ret = arm_bL_ops->init_opp_table(cpu_dev); + if (ret) { + dev_err(cpu_dev, "%s: init_opp_table failed, cpu: %d, err: %d\n", __func__, cpu_dev->id, ret); - goto out; + goto out; + } } ret = dev_pm_opp_init_cpufreq_table(cpu_dev, &freq_table[cluster]); @@ -542,7 +544,7 @@ int bL_cpufreq_register(struct cpufreq_arm_bL_ops *ops) return -EBUSY; } - if (!ops || !strlen(ops->name) || !ops->init_opp_table) { + if (!ops || !strlen(ops->name)) { pr_err("%s: Invalid arm_bL_ops, exiting\n", __func__); return -ENODEV; } diff --git a/drivers/cpufreq/arm_big_little_dt.c b/drivers/cpufreq/arm_big_little_dt.c index 8d9d591..502182d 100644 --- a/drivers/cpufreq/arm_big_little_dt.c +++ b/drivers/cpufreq/arm_big_little_dt.c @@ -43,23 +43,6 @@ static struct device_node *get_cpu_node_with_valid_op(int cpu) return np; } -static int dt_init_opp_table(struct device *cpu_dev) -{ - struct device_node *np; - int ret; - - np = of_node_get(cpu_dev->of_node); - if (!np) { - pr_err("failed to find cpu%d node\n", cpu_dev->id); - return -ENOENT; - } - - ret = of_init_opp_table(cpu_dev); - of_node_put(np); - - return ret; -} - static int dt_get_transition_latency(struct device *cpu_dev) { struct device_node *np; @@ -81,7 +64,6 @@ static int dt_get_transition_latency(struct device *cpu_dev) static struct cpufreq_arm_bL_ops dt_bL_ops = { .name = "dt-bl", .get_transition_latency = dt_get_transition_latency, - .init_opp_table = dt_init_opp_table, }; static int generic_bL_probe(struct platform_device *pdev)
OPP tables are already initialized for all CPUs by cpufreq core and so we don't need to reinitialize them from arm_big_little_dt driver. Also, as the arm_big_little_dt driver doesn't have a .init_opp_table() callback anymore, make it optional in arm_big_little driver. Cc: Sudeep Holla <sudeep.holla@arm.com> Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org> --- drivers/cpufreq/arm_big_little.c | 12 +++++++----- drivers/cpufreq/arm_big_little_dt.c | 18 ------------------ 2 files changed, 7 insertions(+), 23 deletions(-)