cpufreq: mediatek-hw: Add support for MT8196

The MT8196 SoC uses DVFS to set a desired target frequency for each CPU
core. It also uses slightly different register offsets.

Add support for it, which necessitates reworking how the mmio regs are
acquired, as mt8196 has the fdvfs register before the performance domain
registers.

I've verified with both `sysbench cpu run` and `head -c 10G \
/dev/urandom | pigz -p 8 -c - | pv -ba > /dev/null` that we don't just
get a higher reported clock frequency, but that the observed performance
also increases, by a factor of 2.64 in an 8 thread sysbench test.

Signed-off-by: Nicolas Frattaroli <nicolas.frattaroli@collabora.com>
Reviewed-by: AngeloGioacchino Del Regno <angelogiaocchino.delregno@collabora.com>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/mediatek-cpufreq-hw.c b/drivers/cpufreq/mediatek-cpufreq-hw.c
index 53611077d0d9a2d9865cf771568ab71abc0e6fbd..e4eadce6f937ceff51b34d22da83c51b4e9aa813 100644 (file)
--- a/drivers/cpufreq/mediatek-cpufreq-hw.c
+++ b/drivers/cpufreq/mediatek-cpufreq-hw.c
@@ -24,6 +24,8 @@
 #define POLL_USEC                      1000
 #define TIMEOUT_USEC                   300000
 
+#define FDVFS_FDIV_HZ (26 * 1000)
+
 enum {
        REG_FREQ_LUT_TABLE,
        REG_FREQ_ENABLE,
@@ -36,7 +38,9 @@ enum {
 };
 
 struct mtk_cpufreq_priv {
+       struct device *dev;
        const struct mtk_cpufreq_variant *variant;
+       void __iomem *fdvfs;
 };
 
 struct mtk_cpufreq_domain {
@@ -49,7 +53,9 @@ struct mtk_cpufreq_domain {
 };
 
 struct mtk_cpufreq_variant {
+       int (*init)(struct mtk_cpufreq_priv *priv);
        const u16 reg_offsets[REG_ARRAY_SIZE];
+       const bool is_hybrid_dvfs;
 };
 
 static const struct mtk_cpufreq_variant cpufreq_mtk_base_variant = {
@@ -63,6 +69,29 @@ static const struct mtk_cpufreq_variant cpufreq_mtk_base_variant = {
        },
 };
 
+static int mtk_cpufreq_hw_mt8196_init(struct mtk_cpufreq_priv *priv)
+{
+       priv->fdvfs = devm_of_iomap(priv->dev, priv->dev->of_node, 0, NULL);
+       if (IS_ERR_OR_NULL(priv->fdvfs))
+               return dev_err_probe(priv->dev, PTR_ERR(priv->fdvfs),
+                                    "failed to get fdvfs iomem\n");
+
+       return 0;
+}
+
+static const struct mtk_cpufreq_variant cpufreq_mtk_mt8196_variant = {
+       .init = mtk_cpufreq_hw_mt8196_init,
+       .reg_offsets = {
+               [REG_FREQ_LUT_TABLE]    = 0x0,
+               [REG_FREQ_ENABLE]       = 0x84,
+               [REG_FREQ_PERF_STATE]   = 0x88,
+               [REG_FREQ_HW_STATE]     = 0x8c,
+               [REG_EM_POWER_TBL]      = 0x90,
+               [REG_FREQ_LATENCY]      = 0x114,
+       },
+       .is_hybrid_dvfs = true,
+};
+
 static int __maybe_unused
 mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *uW,
                          unsigned long *KHz)
@@ -91,12 +120,31 @@ mtk_cpufreq_get_cpu_power(struct device *cpu_dev, unsigned long *uW,
        return 0;
 }
 
+static void mtk_cpufreq_hw_fdvfs_switch(unsigned int target_freq,
+                                       struct cpufreq_policy *policy)
+{
+       struct mtk_cpufreq_domain *data = policy->driver_data;
+       struct mtk_cpufreq_priv *priv = data->parent;
+       unsigned int cpu;
+
+       target_freq = DIV_ROUND_UP(target_freq, FDVFS_FDIV_HZ);
+       for_each_cpu(cpu, policy->real_cpus) {
+               writel_relaxed(target_freq, priv->fdvfs + cpu * 4);
+       }
+}
+
 static int mtk_cpufreq_hw_target_index(struct cpufreq_policy *policy,
                                       unsigned int index)
 {
        struct mtk_cpufreq_domain *data = policy->driver_data;
+       unsigned int target_freq;
 
-       writel_relaxed(index, data->reg_bases[REG_FREQ_PERF_STATE]);
+       if (data->parent->fdvfs) {
+               target_freq = policy->freq_table[index].frequency;
+               mtk_cpufreq_hw_fdvfs_switch(target_freq, policy);
+       } else {
+               writel_relaxed(index, data->reg_bases[REG_FREQ_PERF_STATE]);
+       }
 
        return 0;
 }
@@ -127,7 +175,10 @@ static unsigned int mtk_cpufreq_hw_fast_switch(struct cpufreq_policy *policy,
 
        index = cpufreq_table_find_index_dl(policy, target_freq, false);
 
-       writel_relaxed(index, data->reg_bases[REG_FREQ_PERF_STATE]);
+       if (data->parent->fdvfs)
+               mtk_cpufreq_hw_fdvfs_switch(target_freq, policy);
+       else
+               writel_relaxed(index, data->reg_bases[REG_FREQ_PERF_STATE]);
 
        return policy->freq_table[index].frequency;
 }
@@ -191,6 +242,13 @@ static int mtk_cpu_resources_init(struct platform_device *pdev,
        index = args.args[0];
        of_node_put(args.np);
 
+       /*
+        * In a cpufreq with hybrid DVFS, such as the MT8196, the first declared
+        * register range is for FDVFS, followed by the frequency domain MMIOs.
+        */
+       if (priv->variant->is_hybrid_dvfs)
+               index++;
+
        data->parent = priv;
 
        res = platform_get_resource(pdev, IORESOURCE_MEM, index);
@@ -339,6 +397,13 @@ static int mtk_cpufreq_hw_driver_probe(struct platform_device *pdev)
                return -ENOMEM;
 
        priv->variant = data;
+       priv->dev = &pdev->dev;
+
+       if (priv->variant->init) {
+               ret = priv->variant->init(priv);
+               if (ret)
+                       return ret;
+       }
 
        platform_set_drvdata(pdev, priv);
        cpufreq_mtk_hw_driver.driver_data = pdev;
@@ -357,6 +422,7 @@ static void mtk_cpufreq_hw_driver_remove(struct platform_device *pdev)
 
 static const struct of_device_id mtk_cpufreq_hw_match[] = {
        { .compatible = "mediatek,cpufreq-hw", .data = &cpufreq_mtk_base_variant },
+       { .compatible = "mediatek,mt8196-cpufreq-hw", .data = &cpufreq_mtk_mt8196_variant },
        {}
 };
 MODULE_DEVICE_TABLE(of, mtk_cpufreq_hw_match);