Merge tag 'tegra-for-5.8-cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git...
authorArnd Bergmann <arnd@arndb.de>
Mon, 25 May 2020 21:24:55 +0000 (23:24 +0200)
committerArnd Bergmann <arnd@arndb.de>
Mon, 25 May 2020 21:24:56 +0000 (23:24 +0200)
cpufreq: Changes for v5.8-rc1

This change move Tegra20 and Tegra30 to the generic DT CPU frequency
scaling driver.

* tag 'tegra-for-5.8-cpufreq' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux:
  cpufreq: tegra20: Use generic cpufreq-dt driver (Tegra30 supported now)

Link: https://lore.kernel.org/r/20200515145311.1580134-2-thierry.reding@gmail.com
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
drivers/cpufreq/Kconfig.arm
drivers/cpufreq/tegra20-cpufreq.c

index 15c1a12315164e243050900ffcc78e311d0bf4fd..d3b33a23d2608a4bcba403f75852669105197331 100644 (file)
@@ -295,11 +295,11 @@ config ARM_TANGO_CPUFREQ
        default y
 
 config ARM_TEGRA20_CPUFREQ
-       tristate "Tegra20 CPUFreq support"
-       depends on ARCH_TEGRA
+       tristate "Tegra20/30 CPUFreq support"
+       depends on ARCH_TEGRA && CPUFREQ_DT
        default y
        help
-         This adds the CPUFreq driver support for Tegra20 SOCs.
+         This adds the CPUFreq driver support for Tegra20/30 SOCs.
 
 config ARM_TEGRA124_CPUFREQ
        bool "Tegra124 CPUFreq support"
index f84ecd22f488612f9c3a2aa8637c6ffd581094f0..8c893043953e46f4b8380612433f2ee49d6ba11f 100644 (file)
  *     Based on arch/arm/plat-omap/cpu-omap.c, (C) 2005 Nokia Corporation
  */
 
-#include <linux/clk.h>
-#include <linux/cpufreq.h>
+#include <linux/bits.h>
+#include <linux/cpu.h>
 #include <linux/err.h>
 #include <linux/init.h>
 #include <linux/module.h>
+#include <linux/of_device.h>
 #include <linux/platform_device.h>
+#include <linux/pm_opp.h>
 #include <linux/types.h>
 
-static struct cpufreq_frequency_table freq_table[] = {
-       { .frequency = 216000 },
-       { .frequency = 312000 },
-       { .frequency = 456000 },
-       { .frequency = 608000 },
-       { .frequency = 760000 },
-       { .frequency = 816000 },
-       { .frequency = 912000 },
-       { .frequency = 1000000 },
-       { .frequency = CPUFREQ_TABLE_END },
-};
-
-struct tegra20_cpufreq {
-       struct device *dev;
-       struct cpufreq_driver driver;
-       struct clk *cpu_clk;
-       struct clk *pll_x_clk;
-       struct clk *pll_p_clk;
-       bool pll_x_prepared;
-};
+#include <soc/tegra/common.h>
+#include <soc/tegra/fuse.h>
 
-static unsigned int tegra_get_intermediate(struct cpufreq_policy *policy,
-                                          unsigned int index)
+static bool cpu0_node_has_opp_v2_prop(void)
 {
-       struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-       unsigned int ifreq = clk_get_rate(cpufreq->pll_p_clk) / 1000;
-
-       /*
-        * Don't switch to intermediate freq if:
-        * - we are already at it, i.e. policy->cur == ifreq
-        * - index corresponds to ifreq
-        */
-       if (freq_table[index].frequency == ifreq || policy->cur == ifreq)
-               return 0;
-
-       return ifreq;
-}
+       struct device_node *np = of_cpu_device_node_get(0);
+       bool ret = false;
 
-static int tegra_target_intermediate(struct cpufreq_policy *policy,
-                                    unsigned int index)
-{
-       struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-       int ret;
-
-       /*
-        * Take an extra reference to the main pll so it doesn't turn
-        * off when we move the cpu off of it as enabling it again while we
-        * switch to it from tegra_target() would take additional time.
-        *
-        * When target-freq is equal to intermediate freq we don't need to
-        * switch to an intermediate freq and so this routine isn't called.
-        * Also, we wouldn't be using pll_x anymore and must not take extra
-        * reference to it, as it can be disabled now to save some power.
-        */
-       clk_prepare_enable(cpufreq->pll_x_clk);
-
-       ret = clk_set_parent(cpufreq->cpu_clk, cpufreq->pll_p_clk);
-       if (ret)
-               clk_disable_unprepare(cpufreq->pll_x_clk);
-       else
-               cpufreq->pll_x_prepared = true;
+       if (of_get_property(np, "operating-points-v2", NULL))
+               ret = true;
 
+       of_node_put(np);
        return ret;
 }
 
-static int tegra_target(struct cpufreq_policy *policy, unsigned int index)
-{
-       struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-       unsigned long rate = freq_table[index].frequency;
-       unsigned int ifreq = clk_get_rate(cpufreq->pll_p_clk) / 1000;
-       int ret;
-
-       /*
-        * target freq == pll_p, don't need to take extra reference to pll_x_clk
-        * as it isn't used anymore.
-        */
-       if (rate == ifreq)
-               return clk_set_parent(cpufreq->cpu_clk, cpufreq->pll_p_clk);
-
-       ret = clk_set_rate(cpufreq->pll_x_clk, rate * 1000);
-       /* Restore to earlier frequency on error, i.e. pll_x */
-       if (ret)
-               dev_err(cpufreq->dev, "Failed to change pll_x to %lu\n", rate);
-
-       ret = clk_set_parent(cpufreq->cpu_clk, cpufreq->pll_x_clk);
-       /* This shouldn't fail while changing or restoring */
-       WARN_ON(ret);
-
-       /*
-        * Drop count to pll_x clock only if we switched to intermediate freq
-        * earlier while transitioning to a target frequency.
-        */
-       if (cpufreq->pll_x_prepared) {
-               clk_disable_unprepare(cpufreq->pll_x_clk);
-               cpufreq->pll_x_prepared = false;
-       }
-
-       return ret;
-}
-
-static int tegra_cpu_init(struct cpufreq_policy *policy)
-{
-       struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-
-       clk_prepare_enable(cpufreq->cpu_clk);
-
-       /* FIXME: what's the actual transition time? */
-       cpufreq_generic_init(policy, freq_table, 300 * 1000);
-       policy->clk = cpufreq->cpu_clk;
-       policy->suspend_freq = freq_table[0].frequency;
-       return 0;
-}
-
-static int tegra_cpu_exit(struct cpufreq_policy *policy)
-{
-       struct tegra20_cpufreq *cpufreq = cpufreq_get_driver_data();
-
-       clk_disable_unprepare(cpufreq->cpu_clk);
-       return 0;
-}
-
 static int tegra20_cpufreq_probe(struct platform_device *pdev)
 {
-       struct tegra20_cpufreq *cpufreq;
+       struct platform_device *cpufreq_dt;
+       struct opp_table *opp_table;
+       struct device *cpu_dev;
+       u32 versions[2];
        int err;
 
-       cpufreq = devm_kzalloc(&pdev->dev, sizeof(*cpufreq), GFP_KERNEL);
-       if (!cpufreq)
-               return -ENOMEM;
+       if (!cpu0_node_has_opp_v2_prop()) {
+               dev_err(&pdev->dev, "operating points not found\n");
+               dev_err(&pdev->dev, "please update your device tree\n");
+               return -ENODEV;
+       }
+
+       if (of_machine_is_compatible("nvidia,tegra20")) {
+               versions[0] = BIT(tegra_sku_info.cpu_process_id);
+               versions[1] = BIT(tegra_sku_info.soc_speedo_id);
+       } else {
+               versions[0] = BIT(tegra_sku_info.cpu_process_id);
+               versions[1] = BIT(tegra_sku_info.cpu_speedo_id);
+       }
+
+       dev_info(&pdev->dev, "hardware version 0x%x 0x%x\n",
+                versions[0], versions[1]);
 
-       cpufreq->cpu_clk = clk_get_sys(NULL, "cclk");
-       if (IS_ERR(cpufreq->cpu_clk))
-               return PTR_ERR(cpufreq->cpu_clk);
+       cpu_dev = get_cpu_device(0);
+       if (WARN_ON(!cpu_dev))
+               return -ENODEV;
 
-       cpufreq->pll_x_clk = clk_get_sys(NULL, "pll_x");
-       if (IS_ERR(cpufreq->pll_x_clk)) {
-               err = PTR_ERR(cpufreq->pll_x_clk);
-               goto put_cpu;
+       opp_table = dev_pm_opp_set_supported_hw(cpu_dev, versions, 2);
+       err = PTR_ERR_OR_ZERO(opp_table);
+       if (err) {
+               dev_err(&pdev->dev, "failed to set supported hw: %d\n", err);
+               return err;
        }
 
-       cpufreq->pll_p_clk = clk_get_sys(NULL, "pll_p");
-       if (IS_ERR(cpufreq->pll_p_clk)) {
-               err = PTR_ERR(cpufreq->pll_p_clk);
-               goto put_pll_x;
+       cpufreq_dt = platform_device_register_simple("cpufreq-dt", -1, NULL, 0);
+       err = PTR_ERR_OR_ZERO(cpufreq_dt);
+       if (err) {
+               dev_err(&pdev->dev,
+                       "failed to create cpufreq-dt device: %d\n", err);
+               goto err_put_supported_hw;
        }
 
-       cpufreq->dev = &pdev->dev;
-       cpufreq->driver.get = cpufreq_generic_get;
-       cpufreq->driver.attr = cpufreq_generic_attr;
-       cpufreq->driver.init = tegra_cpu_init;
-       cpufreq->driver.exit = tegra_cpu_exit;
-       cpufreq->driver.flags = CPUFREQ_NEED_INITIAL_FREQ_CHECK;
-       cpufreq->driver.verify = cpufreq_generic_frequency_table_verify;
-       cpufreq->driver.suspend = cpufreq_generic_suspend;
-       cpufreq->driver.driver_data = cpufreq;
-       cpufreq->driver.target_index = tegra_target;
-       cpufreq->driver.get_intermediate = tegra_get_intermediate;
-       cpufreq->driver.target_intermediate = tegra_target_intermediate;
-       snprintf(cpufreq->driver.name, CPUFREQ_NAME_LEN, "tegra");
-
-       err = cpufreq_register_driver(&cpufreq->driver);
-       if (err)
-               goto put_pll_p;
-
-       platform_set_drvdata(pdev, cpufreq);
+       platform_set_drvdata(pdev, cpufreq_dt);
 
        return 0;
 
-put_pll_p:
-       clk_put(cpufreq->pll_p_clk);
-put_pll_x:
-       clk_put(cpufreq->pll_x_clk);
-put_cpu:
-       clk_put(cpufreq->cpu_clk);
+err_put_supported_hw:
+       dev_pm_opp_put_supported_hw(opp_table);
 
        return err;
 }
 
 static int tegra20_cpufreq_remove(struct platform_device *pdev)
 {
-       struct tegra20_cpufreq *cpufreq = platform_get_drvdata(pdev);
+       struct platform_device *cpufreq_dt;
+       struct opp_table *opp_table;
 
-       cpufreq_unregister_driver(&cpufreq->driver);
+       cpufreq_dt = platform_get_drvdata(pdev);
+       platform_device_unregister(cpufreq_dt);
 
-       clk_put(cpufreq->pll_p_clk);
-       clk_put(cpufreq->pll_x_clk);
-       clk_put(cpufreq->cpu_clk);
+       opp_table = dev_pm_opp_get_opp_table(get_cpu_device(0));
+       dev_pm_opp_put_supported_hw(opp_table);
+       dev_pm_opp_put_opp_table(opp_table);
 
        return 0;
 }