| Message ID | 1483706070-12357-1-git-send-email-sudeep.holla@arm.com |
|---|---|
| State | Accepted |
| Commit | 67bcc2c5f1da8c5bb58e72354274ea5c59a3950a |
| Headers | show |
Of course. W dniu 09.01.2017 o 10:58, Sudeep Holla pisze: > > > On 07/01/17 00:44, Michał Zegan wrote: >> seems the patch works as intended. >> > > So, can we take this as > Tested-by: Michał Zegan <webczat_200@poczta.onet.pl> ? > >> W dniu 06.01.2017 o 13:34, Sudeep Holla pisze: >>> Currently we add the virtual cpufreq device unconditionally even when >>> the SCPI DVFS clock provider node is disabled. This will cause cpufreq >>> driver to throw errors when it gets initailised on boot/modprobe and >>> also when the CPUs are hot-plugged back in. >>> >>> This patch fixes the issue by adding the virtual cpufreq device only if >>> the SCPI DVFS clock provider is available and registered. >>> >>> Fixes: 9490f01e2471 ("clk: scpi: add support for cpufreq virtual device") >>> Reported-by: Michał Zegan <webczat_200@poczta.onet.pl> >>> Cc: Neil Armstrong <narmstrong@baylibre.com> >>> Cc: Michael Turquette <mturquette@baylibre.com> >>> Cc: Stephen Boyd <sboyd@codeaurora.org> >>> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> > _______________________________________________ linux-arm-kernel mailing list linux-arm-kernel@lists.infradead.org http://lists.infradead.org/mailman/listinfo/linux-arm-kernel
diff --git a/drivers/clk/clk-scpi.c b/drivers/clk/clk-scpi.c index 2a3e9d8e88b0..96d37175d0ad 100644 --- a/drivers/clk/clk-scpi.c +++ b/drivers/clk/clk-scpi.c @@ -290,13 +290,15 @@ static int scpi_clocks_probe(struct platform_device *pdev) of_node_put(child); return ret; } - } - /* Add the virtual cpufreq device */ - cpufreq_dev = platform_device_register_simple("scpi-cpufreq", - -1, NULL, 0); - if (IS_ERR(cpufreq_dev)) - pr_warn("unable to register cpufreq device"); + if (match->data != &scpi_dvfs_ops) + continue; + /* Add the virtual cpufreq device if it's DVFS clock provider */ + cpufreq_dev = platform_device_register_simple("scpi-cpufreq", + -1, NULL, 0); + if (IS_ERR(cpufreq_dev)) + pr_warn("unable to register cpufreq device"); + } return 0; }
Currently we add the virtual cpufreq device unconditionally even when the SCPI DVFS clock provider node is disabled. This will cause cpufreq driver to throw errors when it gets initailised on boot/modprobe and also when the CPUs are hot-plugged back in. This patch fixes the issue by adding the virtual cpufreq device only if the SCPI DVFS clock provider is available and registered. Fixes: 9490f01e2471 ("clk: scpi: add support for cpufreq virtual device") Reported-by: Michał Zegan <webczat_200@poczta.onet.pl> Cc: Neil Armstrong <narmstrong@baylibre.com> Cc: Michael Turquette <mturquette@baylibre.com> Cc: Stephen Boyd <sboyd@codeaurora.org> Signed-off-by: Sudeep Holla <sudeep.holla@arm.com> --- drivers/clk/clk-scpi.c | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-)