Revert "cpufreq: disable pm_qos for K4.14 kernel"

It also retains the initialization of qmin and qmax in
tegra210 version of cpu_freq_notify.

This reverts commit 5f9419731a52562bb34cdbe6ad98ae84cb7c522b.

bug 200423735

Change-Id: I480f9e8fde491652f6116bb03064f5cfc3d25b46
Signed-off-by: Bo Yan <byan@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1770757
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Vince Hsu <vinceh@nvidia.com>
Tested-by: Vince Hsu <vinceh@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Sachin Nikam <snikam@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 2 insertions, 19 deletions

diff --git a/drivers/cpufreq/tegra194_cpufreq.c b/drivers/cpufreq/tegra194_cpufreq.c
index c2a5075ae..2cfb89ef9 100644
--- a/drivers/cpufreq/tegra194_cpufreq.c
+++ b/drivers/cpufreq/tegra194_cpufreq.c
@@ -825,10 +825,8 @@ static int tegra_boundaries_policy_notifier(struct notifier_block *nb,
         if (event != CPUFREQ_ADJUST)
                 return NOTIFY_OK;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         qmin = pm_qos_read_min_bound(PM_QOS_CPU_FREQ_BOUNDS);
         qmax = pm_qos_read_max_bound(PM_QOS_CPU_FREQ_BOUNDS);
-#endif
 
         /*
          * Clamp pmqos to stay within sysfs upper boundary
@@ -858,14 +856,10 @@ static struct notifier_block tegra_boundaries_cpufreq_nb = {
 
 static void __init pm_qos_register_notifier(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         pm_qos_add_min_notifier(PM_QOS_CPU_FREQ_BOUNDS,
                 &cpu_freq_nb);
         pm_qos_add_max_notifier(PM_QOS_CPU_FREQ_BOUNDS,
                 &cpu_freq_nb);
-#else
-        pr_info("pm_qos for cpufreq yet to be implemented %p\n", &cpu_freq_nb);
-#endif
 }
 
 static void free_resources(void)
diff --git a/drivers/cpufreq/tegra210-cpufreq.c b/drivers/cpufreq/tegra210-cpufreq.c
index 6725fd8ff..6616d4c17 100644
--- a/drivers/cpufreq/tegra210-cpufreq.c
+++ b/drivers/cpufreq/tegra210-cpufreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2016-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, 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
@@ -24,7 +24,6 @@
 #include <linux/cpufreq.h>
 #include <linux/platform_device.h>
 #include <linux/pm_qos.h>
-#include <linux/version.h>
 
 #include <linux/platform/tegra/emc_bwmgr.h>
 #include <linux/platform/tegra/cpu-tegra.h>
@@ -67,10 +66,8 @@ static int cpu_freq_notify(struct notifier_block *b,
 {
         u32 qmin = 0, qmax = UINT_MAX, cpu;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         qmin = (u32)pm_qos_read_min_bound(PM_QOS_CPU_FREQ_BOUNDS);
         qmax = (u32)pm_qos_read_max_bound(PM_QOS_CPU_FREQ_BOUNDS);
-#endif
 
         pr_debug("PM QoS %s %lu\n",
                 b == &tfreq_priv->min_freq_notifier ? "min" : "max", l);
@@ -95,12 +92,10 @@ static void pm_qos_register_notifier(void)
                 tfreq_priv->max_freq_notifier.notifier_call =
                         cpu_freq_notify;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         pm_qos_add_min_notifier(PM_QOS_CPU_FREQ_BOUNDS,
                 &tfreq_priv->min_freq_notifier);
         pm_qos_add_max_notifier(PM_QOS_CPU_FREQ_BOUNDS,
                 &tfreq_priv->max_freq_notifier);
-#endif
 }
 
 struct device_node *of_get_scaling_node(const char *name)
diff --git a/drivers/cpufreq/tegra_cpufreq.c b/drivers/cpufreq/tegra_cpufreq.c
index d4d7dc600..135f2f181 100644
--- a/drivers/cpufreq/tegra_cpufreq.c
+++ b/drivers/cpufreq/tegra_cpufreq.c
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2015-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2015-2017, 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
@@ -982,10 +982,8 @@ static int tegra_boundaries_policy_notifier(struct notifier_block *nb,
         if (event != CPUFREQ_ADJUST)
                 return NOTIFY_OK;
 
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         qmin = pm_qos_read_min_bound(PM_QOS_CPU_FREQ_BOUNDS);
         qmax = pm_qos_read_max_bound(PM_QOS_CPU_FREQ_BOUNDS);
-#endif
 
         /*
          * Clamp pmqos to stay within sysfs upper boundary
@@ -1057,14 +1055,10 @@ static struct notifier_block tegra_cpu_pm_nb = {
 
 static void pm_qos_register_notifier(void)
 {
-#if LINUX_VERSION_CODE < KERNEL_VERSION(4, 14, 0)
         pm_qos_add_min_notifier(PM_QOS_CPU_FREQ_BOUNDS,
                 &cluster_freq_nb);
         pm_qos_add_max_notifier(PM_QOS_CPU_FREQ_BOUNDS,
                 &cluster_freq_nb);
-#else
-        pr_info("pm_qos for cpufreq yet to be done: %p\n", &cluster_freq_nb);
-#endif
 }
 
 /* Free lut space shared beteen CPU and BPMP */