Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo...
[linux-2.6-microblaze.git] / drivers / cpufreq / qcom-cpufreq-hw.c
index 3fb044b..9ed5341 100644 (file)
 #define LUT_L_VAL                      GENMASK(7, 0)
 #define LUT_CORE_COUNT                 GENMASK(18, 16)
 #define LUT_VOLT                       GENMASK(11, 0)
-#define LUT_ROW_SIZE                   32
 #define CLK_HW_DIV                     2
 #define LUT_TURBO_IND                  1
 
-/* Register offsets */
-#define REG_ENABLE                     0x0
-#define REG_FREQ_LUT                   0x110
-#define REG_VOLT_LUT                   0x114
-#define REG_PERF_STATE                 0x920
+struct qcom_cpufreq_soc_data {
+       u32 reg_enable;
+       u32 reg_freq_lut;
+       u32 reg_volt_lut;
+       u32 reg_perf_state;
+       u8 lut_row_size;
+};
+
+struct qcom_cpufreq_data {
+       void __iomem *base;
+       const struct qcom_cpufreq_soc_data *soc_data;
+};
 
 static unsigned long cpu_hw_rate, xo_rate;
-static struct platform_device *global_pdev;
 static bool icc_scaling_enabled;
 
 static int qcom_cpufreq_set_bw(struct cpufreq_policy *policy,
@@ -77,22 +82,22 @@ static int qcom_cpufreq_update_opp(struct device *cpu_dev,
 static int qcom_cpufreq_hw_target_index(struct cpufreq_policy *policy,
                                        unsigned int index)
 {
-       void __iomem *perf_state_reg = policy->driver_data;
+       struct qcom_cpufreq_data *data = policy->driver_data;
+       const struct qcom_cpufreq_soc_data *soc_data = data->soc_data;
        unsigned long freq = policy->freq_table[index].frequency;
 
-       writel_relaxed(index, perf_state_reg);
+       writel_relaxed(index, data->base + soc_data->reg_perf_state);
 
        if (icc_scaling_enabled)
                qcom_cpufreq_set_bw(policy, freq);
 
-       arch_set_freq_scale(policy->related_cpus, freq,
-                           policy->cpuinfo.max_freq);
        return 0;
 }
 
 static unsigned int qcom_cpufreq_hw_get(unsigned int cpu)
 {
-       void __iomem *perf_state_reg;
+       struct qcom_cpufreq_data *data;
+       const struct qcom_cpufreq_soc_data *soc_data;
        struct cpufreq_policy *policy;
        unsigned int index;
 
@@ -100,9 +105,10 @@ static unsigned int qcom_cpufreq_hw_get(unsigned int cpu)
        if (!policy)
                return 0;
 
-       perf_state_reg = policy->driver_data;
+       data = policy->driver_data;
+       soc_data = data->soc_data;
 
-       index = readl_relaxed(perf_state_reg);
+       index = readl_relaxed(data->base + soc_data->reg_perf_state);
        index = min(index, LUT_MAX_ENTRIES - 1);
 
        return policy->freq_table[index].frequency;
@@ -111,23 +117,18 @@ static unsigned int qcom_cpufreq_hw_get(unsigned int cpu)
 static unsigned int qcom_cpufreq_hw_fast_switch(struct cpufreq_policy *policy,
                                                unsigned int target_freq)
 {
-       void __iomem *perf_state_reg = policy->driver_data;
+       struct qcom_cpufreq_data *data = policy->driver_data;
+       const struct qcom_cpufreq_soc_data *soc_data = data->soc_data;
        unsigned int index;
-       unsigned long freq;
 
        index = policy->cached_resolved_idx;
-       writel_relaxed(index, perf_state_reg);
+       writel_relaxed(index, data->base + soc_data->reg_perf_state);
 
-       freq = policy->freq_table[index].frequency;
-       arch_set_freq_scale(policy->related_cpus, freq,
-                           policy->cpuinfo.max_freq);
-
-       return freq;
+       return policy->freq_table[index].frequency;
 }
 
 static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
-                                   struct cpufreq_policy *policy,
-                                   void __iomem *base)
+                                   struct cpufreq_policy *policy)
 {
        u32 data, src, lval, i, core_count, prev_freq = 0, freq;
        u32 volt;
@@ -135,6 +136,8 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
        struct dev_pm_opp *opp;
        unsigned long rate;
        int ret;
+       struct qcom_cpufreq_data *drv_data = policy->driver_data;
+       const struct qcom_cpufreq_soc_data *soc_data = drv_data->soc_data;
 
        table = kcalloc(LUT_MAX_ENTRIES + 1, sizeof(*table), GFP_KERNEL);
        if (!table)
@@ -161,14 +164,14 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
        }
 
        for (i = 0; i < LUT_MAX_ENTRIES; i++) {
-               data = readl_relaxed(base + REG_FREQ_LUT +
-                                     i * LUT_ROW_SIZE);
+               data = readl_relaxed(drv_data->base + soc_data->reg_freq_lut +
+                                     i * soc_data->lut_row_size);
                src = FIELD_GET(LUT_SRC, data);
                lval = FIELD_GET(LUT_L_VAL, data);
                core_count = FIELD_GET(LUT_CORE_COUNT, data);
 
-               data = readl_relaxed(base + REG_VOLT_LUT +
-                                     i * LUT_ROW_SIZE);
+               data = readl_relaxed(drv_data->base + soc_data->reg_volt_lut +
+                                     i * soc_data->lut_row_size);
                volt = FIELD_GET(LUT_VOLT, data) * 1000;
 
                if (src)
@@ -177,10 +180,15 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
                        freq = cpu_hw_rate / 1000;
 
                if (freq != prev_freq && core_count != LUT_TURBO_IND) {
-                       table[i].frequency = freq;
-                       qcom_cpufreq_update_opp(cpu_dev, freq, volt);
-                       dev_dbg(cpu_dev, "index=%d freq=%d, core_count %d\n", i,
+                       if (!qcom_cpufreq_update_opp(cpu_dev, freq, volt)) {
+                               table[i].frequency = freq;
+                               dev_dbg(cpu_dev, "index=%d freq=%d, core_count %d\n", i,
                                freq, core_count);
+                       } else {
+                               dev_warn(cpu_dev, "failed to update OPP for freq=%d\n", freq);
+                               table[i].frequency = CPUFREQ_ENTRY_INVALID;
+                       }
+
                } else if (core_count == LUT_TURBO_IND) {
                        table[i].frequency = CPUFREQ_ENTRY_INVALID;
                }
@@ -197,9 +205,13 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
                         * as the boost frequency
                         */
                        if (prev->frequency == CPUFREQ_ENTRY_INVALID) {
-                               prev->frequency = prev_freq;
-                               prev->flags = CPUFREQ_BOOST_FREQ;
-                               qcom_cpufreq_update_opp(cpu_dev, prev_freq, volt);
+                               if (!qcom_cpufreq_update_opp(cpu_dev, prev_freq, volt)) {
+                                       prev->frequency = prev_freq;
+                                       prev->flags = CPUFREQ_BOOST_FREQ;
+                               } else {
+                                       dev_warn(cpu_dev, "failed to update OPP for freq=%d\n",
+                                                freq);
+                               }
                        }
 
                        break;
@@ -238,14 +250,38 @@ static void qcom_get_related_cpus(int index, struct cpumask *m)
        }
 }
 
+static const struct qcom_cpufreq_soc_data qcom_soc_data = {
+       .reg_enable = 0x0,
+       .reg_freq_lut = 0x110,
+       .reg_volt_lut = 0x114,
+       .reg_perf_state = 0x920,
+       .lut_row_size = 32,
+};
+
+static const struct qcom_cpufreq_soc_data epss_soc_data = {
+       .reg_enable = 0x0,
+       .reg_freq_lut = 0x100,
+       .reg_volt_lut = 0x200,
+       .reg_perf_state = 0x320,
+       .lut_row_size = 4,
+};
+
+static const struct of_device_id qcom_cpufreq_hw_match[] = {
+       { .compatible = "qcom,cpufreq-hw", .data = &qcom_soc_data },
+       { .compatible = "qcom,cpufreq-epss", .data = &epss_soc_data },
+       {}
+};
+MODULE_DEVICE_TABLE(of, qcom_cpufreq_hw_match);
+
 static int qcom_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
 {
-       struct device *dev = &global_pdev->dev;
+       struct platform_device *pdev = cpufreq_get_driver_data();
+       struct device *dev = &pdev->dev;
        struct of_phandle_args args;
        struct device_node *cpu_np;
        struct device *cpu_dev;
-       struct resource *res;
        void __iomem *base;
+       struct qcom_cpufreq_data *data;
        int ret, index;
 
        cpu_dev = get_cpu_device(policy->cpu);
@@ -267,16 +303,21 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
 
        index = args.args[0];
 
-       res = platform_get_resource(global_pdev, IORESOURCE_MEM, index);
-       if (!res)
-               return -ENODEV;
+       base = devm_platform_ioremap_resource(pdev, index);
+       if (IS_ERR(base))
+               return PTR_ERR(base);
 
-       base = devm_ioremap(dev, res->start, resource_size(res));
-       if (!base)
-               return -ENOMEM;
+       data = devm_kzalloc(dev, sizeof(*data), GFP_KERNEL);
+       if (!data) {
+               ret = -ENOMEM;
+               goto error;
+       }
+
+       data->soc_data = of_device_get_match_data(&pdev->dev);
+       data->base = base;
 
        /* HW should be in enabled state to proceed */
-       if (!(readl_relaxed(base + REG_ENABLE) & 0x1)) {
+       if (!(readl_relaxed(base + data->soc_data->reg_enable) & 0x1)) {
                dev_err(dev, "Domain-%d cpufreq hardware not enabled\n", index);
                ret = -ENODEV;
                goto error;
@@ -289,9 +330,9 @@ static int qcom_cpufreq_hw_cpu_init(struct cpufreq_policy *policy)
                goto error;
        }
 
-       policy->driver_data = base + REG_PERF_STATE;
+       policy->driver_data = data;
 
-       ret = qcom_cpufreq_hw_read_lut(cpu_dev, policy, base);
+       ret = qcom_cpufreq_hw_read_lut(cpu_dev, policy);
        if (ret) {
                dev_err(dev, "Domain-%d failed to read LUT\n", index);
                goto error;
@@ -315,12 +356,13 @@ error:
 static int qcom_cpufreq_hw_cpu_exit(struct cpufreq_policy *policy)
 {
        struct device *cpu_dev = get_cpu_device(policy->cpu);
-       void __iomem *base = policy->driver_data - REG_PERF_STATE;
+       struct qcom_cpufreq_data *data = policy->driver_data;
+       struct platform_device *pdev = cpufreq_get_driver_data();
 
        dev_pm_opp_remove_all_dynamic(cpu_dev);
        dev_pm_opp_of_cpumask_remove_table(policy->related_cpus);
        kfree(policy->freq_table);
-       devm_iounmap(&global_pdev->dev, base);
+       devm_iounmap(&pdev->dev, data->base);
 
        return 0;
 }
@@ -365,7 +407,7 @@ static int qcom_cpufreq_hw_driver_probe(struct platform_device *pdev)
        cpu_hw_rate = clk_get_rate(clk) / CLK_HW_DIV;
        clk_put(clk);
 
-       global_pdev = pdev;
+       cpufreq_qcom_hw_driver.driver_data = pdev;
 
        /* Check for optional interconnect paths on CPU0 */
        cpu_dev = get_cpu_device(0);
@@ -390,12 +432,6 @@ static int qcom_cpufreq_hw_driver_remove(struct platform_device *pdev)
        return cpufreq_unregister_driver(&cpufreq_qcom_hw_driver);
 }
 
-static const struct of_device_id qcom_cpufreq_hw_match[] = {
-       { .compatible = "qcom,cpufreq-hw" },
-       {}
-};
-MODULE_DEVICE_TABLE(of, qcom_cpufreq_hw_match);
-
 static struct platform_driver qcom_cpufreq_hw_driver = {
        .probe = qcom_cpufreq_hw_driver_probe,
        .remove = qcom_cpufreq_hw_driver_remove,