gpu: nvgpu: vgpu: restructure vgpu clk implementation

Move OS agnostic parts of vgpu clk code out of os/linux specific
path. This includes implementation sending rpc commands to
RM Server. Move Linux specific vgpu clk code to platform vgpu files
keeping it consistent with native implementation.

Bug 2363882
Jira EVLR-3254

Change-Id: I0aae014ef16415bb356c81e9bfd76bc65206d9fd
Signed-off-by: Aparna Das <aparnad@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1820674
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

7 files changed, 90 insertions, 46 deletions

diff --git a/drivers/gpu/nvgpu/Makefile b/drivers/gpu/nvgpu/Makefile
index 3d7671d0..1b7dbd26 100644
--- a/drivers/gpu/nvgpu/Makefile
+++ b/drivers/gpu/nvgpu/Makefile
@@ -158,7 +158,6 @@ nvgpu-$(CONFIG_TEGRA_GK20A_NVHOST) += \
 nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         os/linux/vgpu/platform_vgpu_tegra.o \
         os/linux/vgpu/fecs_trace_vgpu.o \
-        os/linux/vgpu/clk_vgpu.o \
         os/linux/vgpu/sysfs_vgpu.o \
         os/linux/vgpu/vgpu_ivc.o \
         os/linux/vgpu/vgpu_ivm.o \
@@ -270,6 +269,7 @@ nvgpu-$(CONFIG_TEGRA_GR_VIRTUALIZATION) += \
         vgpu/tsg_vgpu.o \
         vgpu/css_vgpu.o \
         vgpu/ecc_vgpu.o \
+        vgpu/clk_vgpu.o \
         vgpu/gm20b/vgpu_gr_gm20b.o \
         vgpu/gp10b/vgpu_hal_gp10b.o  \
         vgpu/gp10b/vgpu_gr_gp10b.o  \
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
index 8eada9df..e662877d 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/gv11b/platform_gv11b_vgpu_tegra.c
@@ -19,10 +19,11 @@
 #include <nvgpu/nvhost.h>
 
 #include "gk20a/gk20a.h"
-#include "os/linux/vgpu/clk_vgpu.h"
+#include "vgpu/clk_vgpu.h"
 #include "os/linux/platform_gk20a.h"
 #include "os/linux/os_linux.h"
 #include "os/linux/vgpu/vgpu_linux.h"
+#include "os/linux/vgpu/platform_vgpu_tegra.h"
 
 static int gv11b_vgpu_probe(struct device *dev)
 {
@@ -88,8 +89,8 @@ struct gk20a_platform gv11b_vgpu_tegra_platform = {
 
         .probe = gv11b_vgpu_probe,
 
-        .clk_round_rate = vgpu_clk_round_rate,
-        .get_clk_freqs = vgpu_clk_get_freqs,
+        .clk_round_rate = vgpu_plat_clk_round_rate,
+        .get_clk_freqs = vgpu_plat_clk_get_freqs,
 
         /* frequency scaling configuration */
         .devfreq_governor = "userspace",
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c
index 44879a45..25b76988 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.c
@@ -20,7 +20,7 @@
 
 #include "gk20a/gk20a.h"
 #include "os/linux/platform_gk20a.h"
-#include "clk_vgpu.h"
+#include "vgpu/clk_vgpu.h"
 #include "vgpu_linux.h"
 
 static int gk20a_tegra_probe(struct device *dev)
@@ -40,6 +40,29 @@ static int gk20a_tegra_probe(struct device *dev)
 #endif
 }
 
+long vgpu_plat_clk_round_rate(struct device *dev, unsigned long rate)
+{
+        /* server will handle frequency rounding */
+        return rate;
+}
+
+int vgpu_plat_clk_get_freqs(struct device *dev, unsigned long **freqs,
+                        int *num_freqs)
+{
+        struct gk20a_platform *platform = gk20a_get_platform(dev);
+        struct gk20a *g = platform->g;
+
+        return vgpu_clk_get_freqs(g, freqs, num_freqs);
+}
+
+int vgpu_plat_clk_cap_rate(struct device *dev, unsigned long rate)
+{
+        struct gk20a_platform *platform = gk20a_get_platform(dev);
+        struct gk20a *g = platform->g;
+
+        return vgpu_clk_cap_rate(g, rate);
+}
+
 struct gk20a_platform vgpu_tegra_platform = {
         .has_syncpoints = true,
         .aggressive_sync_destroy_thresh = 64,
@@ -60,8 +83,8 @@ struct gk20a_platform vgpu_tegra_platform = {
 
         .probe = gk20a_tegra_probe,
 
-        .clk_round_rate = vgpu_clk_round_rate,
-        .get_clk_freqs = vgpu_clk_get_freqs,
+        .clk_round_rate = vgpu_plat_clk_round_rate,
+        .get_clk_freqs = vgpu_plat_clk_get_freqs,
 
         /* frequency scaling configuration */
         .devfreq_governor = "userspace",
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.h
index 8d477643..fef346d0 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.h
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/platform_vgpu_tegra.h
@@ -1,7 +1,5 @@
 /*
- * Virtualized GPU Clock Interface
- *
- * Copyright (c) 2017, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
  *
  * This program is free software; you can redistribute it and/or modify it
  * under the terms and conditions of the GNU General Public License,
@@ -16,12 +14,11 @@
  * along with this program.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef _CLK_VIRT_H_
-#define _CLK_VIRT_H_
+#ifndef _VGPU_PLATFORM_H_
+#define _VGPU_PLATFORM_H_
 
-void vgpu_init_clk_support(struct gk20a *g);
-long vgpu_clk_round_rate(struct device *dev, unsigned long rate);
-int vgpu_clk_get_freqs(struct device *dev,
-                        unsigned long **freqs, int *num_freqs);
-int vgpu_clk_cap_rate(struct device *dev, unsigned long rate);
+long vgpu_plat_clk_round_rate(struct device *dev, unsigned long rate);
+int vgpu_plat_clk_get_freqs(struct device *dev, unsigned long **freqs,
+                        int *num_freqs);
+int vgpu_plat_clk_cap_rate(struct device *dev, unsigned long rate);
 #endif
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
index 7cf22d9d..f5628bc1 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
+++ b/drivers/gpu/nvgpu/os/linux/vgpu/vgpu_linux.c
@@ -35,7 +35,7 @@
 
 #include "vgpu_linux.h"
 #include "vgpu/fecs_trace_vgpu.h"
-#include "clk_vgpu.h"
+#include "vgpu/clk_vgpu.h"
 #include "gk20a/tsg_gk20a.h"
 #include "gk20a/regops_gk20a.h"
 #include "gm20b/hal_gm20b.h"
@@ -46,6 +46,7 @@
 #include "os/linux/scale.h"
 #include "os/linux/driver_common.h"
 #include "os/linux/platform_gk20a.h"
+#include "os/linux/vgpu/platform_vgpu_tegra.h"
 
 struct vgpu_priv_data *vgpu_get_priv_data(struct gk20a *g)
 {
@@ -244,7 +245,7 @@ static int vgpu_qos_notify(struct notifier_block *nb,
         nvgpu_log_fn(g, " ");
 
         max_freq = (u32)pm_qos_read_max_bound(PM_QOS_GPU_FREQ_BOUNDS);
-        err = vgpu_clk_cap_rate(profile->dev, max_freq);
+        err = vgpu_plat_clk_cap_rate(profile->dev, max_freq);
         if (err)
                 nvgpu_err(g, "%s failed, err=%d", __func__, err);
 
@@ -286,6 +287,7 @@ static void vgpu_pm_qos_remove(struct device *dev)
 static int vgpu_pm_init(struct device *dev)
 {
         struct gk20a *g = get_gk20a(dev);
+        struct gk20a_platform *platform = gk20a_get_platform(dev);
         struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
         unsigned long *freqs;
         int num_freqs;
@@ -303,7 +305,7 @@ static int vgpu_pm_init(struct device *dev)
 
         if (l->devfreq) {
                 /* set min/max frequency based on frequency table */
-                err = vgpu_clk_get_freqs(dev, &freqs, &num_freqs);
+                err = platform->get_clk_freqs(dev, &freqs, &num_freqs);
                 if (err)
                         return err;
 
diff --git a/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c b/drivers/gpu/nvgpu/vgpu/clk_vgpu.c
index 9f6017d3..efcb4fb0 100644
--- a/drivers/gpu/nvgpu/os/linux/vgpu/clk_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/clk_vgpu.c
@@ -1,19 +1,23 @@
 /*
- * Virtualized GPU Clock Interface
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
  *
- * Copyright (c) 2017-2018, NVIDIA CORPORATION.  All rights reserved.
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
  *
- * This program is free software; you can redistribute it and/or modify it
- * under the terms and conditions of the GNU General Public License,
- * version 2, as published by the Free Software Foundation.
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
  *
- * This program is distributed in the hope it will be useful, but WITHOUT
- * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or
- * FITNESS FOR A PARTICULAR PURPOSE.  See the GNU General Public License for
- * more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with this program.  If not, see <http://www.gnu.org/licenses/>.
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
  */
 
 #include <nvgpu/vgpu/vgpu.h>
@@ -21,7 +25,6 @@
 #include "gk20a/gk20a.h"
 #include "clk_vgpu.h"
 #include "ctrl/ctrlclk.h"
-#include "os/linux/platform_gk20a.h"
 
 static unsigned long
 vgpu_freq_table[TEGRA_VGPU_GPU_FREQ_TABLE_SIZE];
@@ -104,17 +107,8 @@ void vgpu_init_clk_support(struct gk20a *g)
         g->ops.clk.get_maxrate = vgpu_clk_get_maxrate;
 }
 
-long vgpu_clk_round_rate(struct device *dev, unsigned long rate)
-{
-        /* server will handle frequency rounding */
-        return rate;
-}
-
-int vgpu_clk_get_freqs(struct device *dev,
-                unsigned long **freqs, int *num_freqs)
+int vgpu_clk_get_freqs(struct gk20a *g, unsigned long **freqs, int *num_freqs)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(dev);
-        struct gk20a *g = platform->g;
         struct tegra_vgpu_cmd_msg msg = {};
         struct tegra_vgpu_get_gpu_freq_table_params *p =
                                         &msg.params.get_gpu_freq_table;
@@ -144,10 +138,8 @@ int vgpu_clk_get_freqs(struct device *dev,
         return 0;
 }
 
-int vgpu_clk_cap_rate(struct device *dev, unsigned long rate)
+int vgpu_clk_cap_rate(struct gk20a *g, unsigned long rate)
 {
-        struct gk20a_platform *platform = gk20a_get_platform(dev);
-        struct gk20a *g = platform->g;
         struct tegra_vgpu_cmd_msg msg = {};
         struct tegra_vgpu_gpu_clk_rate_params *p = &msg.params.gpu_clk_rate;
         int err = 0;
diff --git a/drivers/gpu/nvgpu/vgpu/clk_vgpu.h b/drivers/gpu/nvgpu/vgpu/clk_vgpu.h
new file mode 100644
index 00000000..ae9f8345
--- /dev/null
+++ b/drivers/gpu/nvgpu/vgpu/clk_vgpu.h
@@ -0,0 +1,29 @@
+/*
+ * Copyright (c) 2018, NVIDIA CORPORATION.  All rights reserved.
+ *
+ * Permission is hereby granted, free of charge, to any person obtaining a
+ * copy of this software and associated documentation files (the "Software"),
+ * to deal in the Software without restriction, including without limitation
+ * the rights to use, copy, modify, merge, publish, distribute, sublicense,
+ * and/or sell copies of the Software, and to permit persons to whom the
+ * Software is furnished to do so, subject to the following conditions:
+ *
+ * The above copyright notice and this permission notice shall be included in
+ * all copies or substantial portions of the Software.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+ * IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+ * FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
+ * THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+ * LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
+ * FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+ * DEALINGS IN THE SOFTWARE.
+ */
+
+#ifndef _CLK_VGPU_H_
+#define _CLK_VGPU_H_
+
+void vgpu_init_clk_support(struct gk20a *g);
+int vgpu_clk_get_freqs(struct gk20a *g, unsigned long **freqs, int *num_freqs);
+int vgpu_clk_cap_rate(struct gk20a *g, unsigned long rate);
+#endif