1 files changed, 7 insertions, 73 deletions

diff --git a/drivers/cpufreq/tegra194_cpufreq.c b/drivers/cpufreq/tegra194_cpufreq.c
index 339f923a2..64455007c 100644
--- a/drivers/cpufreq/tegra194_cpufreq.c
+++ b/drivers/cpufreq/tegra194_cpufreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2017-2019, NVIDIA CORPORATION.  All rights reserved.
  *
  * This software is licensed under the terms of the GNU General Public
  * License version 2, as published by the Free Software Foundation, and
@@ -38,6 +38,7 @@
 #include <linux/pm_qos.h>
 #include <linux/workqueue.h>
 #include <linux/tegra-cpufreq.h>
+#include "cpufreq_cpu_emc_table.h"
 
 /* cpufreq transisition latency */
 #define TEGRA_CPUFREQ_TRANSITION_LATENCY (300 * 1000) /* unit in nanoseconds */
@@ -53,12 +54,7 @@
 #define LOOP_FOR_EACH_CLUSTER(cl)       for (cl = 0; \
                                         cl < MAX_CLUSTERS; cl++)
 
-struct cpu_emc_map {
-        uint32_t cpufreq; /* unit in KHz */
-        uint32_t emcfreq; /* unit in KHz */
-};
-static struct cpu_emc_map *cpu_emc_map_ptr;
-static uint16_t cpu_emc_map_num;
+static struct cpu_emc_mapping *cpu_emc_map_ptr;
 static uint8_t tegra_hypervisor_mode;
 
 static int cpufreq_single_policy;
@@ -239,29 +235,12 @@ static unsigned int tegra194_fast_get_speed(uint32_t cpu)
         return tegra194_get_speed_common(cpu, US_DELAY_MIN);
 }
 
-/**
- * cluster_cpu_to_emc_freq - return emc freq in cpu_emc_map table corresponding
- *                           to cpu rate input
- * @cpu_rate - cpu rate in KHz
- * Returns emc freq in KHz
- */
-static unsigned long cluster_cpu_to_emc_freq(uint32_t cpu_rate)
-{
-        int i;
-
-        for (i = 0; i < cpu_emc_map_num; i++) {
-                if (cpu_rate >= cpu_emc_map_ptr[i].cpufreq)
-                        return cpu_emc_map_ptr[i].emcfreq;
-        }
-        return 0;
-}
-
 /* Set emc clock by referring cpu_to_emc freq mapping */
 static void set_cpufreq_to_emcfreq(enum cluster cl, uint32_t cluster_freq)
 {
         unsigned long emc_freq;
 
-        emc_freq = cluster_cpu_to_emc_freq(cluster_freq);
+        emc_freq = tegra_cpu_to_emc_freq(cluster_freq, cpu_emc_map_ptr);
 
         tegra_bwmgr_set_emc(tfreq_data.pcluster[cl].bwmgr,
                 emc_freq * KHZ_TO_HZ, TEGRA_BWMGR_SET_EMC_FLOOR);
@@ -442,32 +421,6 @@ static int set_delay(void *data, u64 val)
 DEFINE_SIMPLE_ATTRIBUTE(freq_compute_fops, get_delay, set_delay,
         "%llu\n");
 
-static int show_cpu_emc_map(struct seq_file *s, void *data)
-{
-        int i;
-        seq_printf(s, "(cpufreq, emcfreq)\n");
-
-        for (i = 0; i < cpu_emc_map_num; i++) {
-                seq_printf(s, "%u %d\n", cpu_emc_map_ptr[i].cpufreq,
-                                        cpu_emc_map_ptr[i].emcfreq);
-        }
-
-        return 0;
-}
-
-static int cpu_emc_map_open(struct inode *inode, struct file *file)
-{
-        return single_open(file, show_cpu_emc_map,
-                        inode->i_private);
-}
-
-static const struct file_operations cpu_emc_map_fops = {
-        .open = cpu_emc_map_open,
-        .read = seq_read,
-        .llseek = seq_lseek,
-        .release = single_release,
-};
-
 static int freq_get(void *data, u64 *val)
 {
         uint64_t cpu = (uint64_t)data;
@@ -713,10 +666,8 @@ static int __init tegra_cpufreq_debug_init(void)
                                         &freq_compute_fops))
                 goto err_out;
 
-        if (!debugfs_create_file("cpu_emc_map", RO_MODE,
-                                tegra_cpufreq_debugfs_root,
-                                        NULL,
-                                        &cpu_emc_map_fops))
+        if (!tegra_debugfs_create_cpu_emc_map(tegra_cpufreq_debugfs_root,
+                                        cpu_emc_map_ptr))
                 goto err_out;
 
         if (cc3_debug_init())
@@ -1079,23 +1030,6 @@ err_out:
         return ret;
 }
 
-static void tegra_cpufreq_cpu_emc_map_init(struct device_node *dn)
-{
-        struct property *prop;
-        int len;
-
-        prop = of_find_property(dn, "cpu_emc_map", &len);
-        if (prop) {
-                len = rounddown(len, sizeof(struct cpu_emc_map));
-                cpu_emc_map_ptr = kzalloc(len, GFP_KERNEL);
-                if (cpu_emc_map_ptr) {
-                        of_property_read_u32_array(dn, "cpu_emc_map",
-                                (u32 *)cpu_emc_map_ptr, len / sizeof(uint32_t));
-                        cpu_emc_map_num = len / sizeof(struct cpu_emc_map);
-                }
-        }
-}
-
 static bool tegra_cpufreq_single_policy(struct device_node *dn)
 {
         struct property *prop;
@@ -1114,7 +1048,7 @@ static int __init tegra194_cpufreq_probe(struct platform_device *pdev)
         int ret = 0, cl = 0;
 
         dn = pdev->dev.of_node;
-        tegra_cpufreq_cpu_emc_map_init(dn);
+        cpu_emc_map_ptr = tegra_cpufreq_cpu_emc_map_dt_init(dn);
         cpufreq_single_policy = tegra_cpufreq_single_policy(dn);
 
         mutex_init(&tfreq_data.mlock);