cpufreq: qcom-hw: Update logic to detect turbo frequency

The core count read back from the each domain's look up table serves
as an indicator for the onset of the turbo frequency and not accurate
representation of number of cores in a paticular domain. Update turbo
detection logic accordingly to add support for SM8150 SoCs.

Signed-off-by: Sibi Sankar <sibis@codeaurora.org>
Signed-off-by: Viresh Kumar <viresh.kumar@linaro.org>

diff --git a/drivers/cpufreq/qcom-cpufreq-hw.c b/drivers/cpufreq/qcom-cpufreq-hw.c
index 4b0b50403901b7c67c56d33cff1438b6ca0ba86a..c9a9da592f1003c4884624a873b527fa5a38f2c8 100644 (file)
--- a/drivers/cpufreq/qcom-cpufreq-hw.c
+++ b/drivers/cpufreq/qcom-cpufreq-hw.c
@@ -20,6 +20,7 @@
 #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
@@ -77,9 +78,8 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
                                    struct cpufreq_policy *policy,
                                    void __iomem *base)
 {
-       u32 data, src, lval, i, core_count, prev_cc = 0, prev_freq = 0, freq;
+       u32 data, src, lval, i, core_count, prev_freq = 0, freq;
        u32 volt;
-       unsigned int max_cores = cpumask_weight(policy->cpus);
        struct cpufreq_frequency_table  *table;
 
        table = kcalloc(LUT_MAX_ENTRIES + 1, sizeof(*table), GFP_KERNEL);
@@ -102,12 +102,12 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
                else
                        freq = cpu_hw_rate / 1000;
 
-               if (freq != prev_freq && core_count == max_cores) {
+               if (freq != prev_freq && core_count != LUT_TURBO_IND) {
                        table[i].frequency = freq;
                        dev_pm_opp_add(cpu_dev, freq * 1000, volt);
                        dev_dbg(cpu_dev, "index=%d freq=%d, core_count %d\n", i,
                                freq, core_count);
-               } else {
+               } else if (core_count == LUT_TURBO_IND) {
                        table[i].frequency = CPUFREQ_ENTRY_INVALID;
                }
 
@@ -115,14 +115,14 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
                 * Two of the same frequencies with the same core counts means
                 * end of table
                 */
-               if (i > 0 && prev_freq == freq && prev_cc == core_count) {
+               if (i > 0 && prev_freq == freq) {
                        struct cpufreq_frequency_table *prev = &table[i - 1];
 
                        /*
                         * Only treat the last frequency that might be a boost
                         * as the boost frequency
                         */
-                       if (prev_cc != max_cores) {
+                       if (prev->frequency == CPUFREQ_ENTRY_INVALID) {
                                prev->frequency = prev_freq;
                                prev->flags = CPUFREQ_BOOST_FREQ;
                                dev_pm_opp_add(cpu_dev, prev_freq * 1000, volt);
@@ -131,7 +131,6 @@ static int qcom_cpufreq_hw_read_lut(struct device *cpu_dev,
                        break;
                }
 
-               prev_cc = core_count;
                prev_freq = freq;
        }