gpu: nvgpu: Reorg therm HAL initialization

Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the
therm sub-module of the gpu_ops struct.

Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.

Jira NVGPU-74

Change-Id: Ic9d03304d3dcde0365cbf22af2dbe1e7eb0e04bb
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1527422
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

3 files changed, 29 insertions, 20 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index f9368621..8077c5e1 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -343,6 +343,16 @@ static const struct gpu_ops gp106_ops = {
                 .exit = gk20a_pramin_exit,
                 .data032_r = pram_data032_r,
         },
+        .therm = {
+#ifdef CONFIG_DEBUG_FS
+                .therm_debugfs_init = gp106_therm_debugfs_init,
+#endif /* CONFIG_DEBUG_FS */
+                .elcg_init_idle_filters = gp106_elcg_init_idle_filters,
+                .get_internal_sensor_curr_temp =
+                        gp106_get_internal_sensor_curr_temp,
+                .get_internal_sensor_limits = gp106_get_internal_sensor_limits,
+                .configure_therm_alert = gp106_configure_therm_alert,
+        },
         .mc = {
                 .intr_enable = mc_gp10b_intr_enable,
                 .intr_unit_config = mc_gp10b_intr_unit_config,
@@ -436,6 +446,7 @@ int gp106_init_hal(struct gk20a *g)
         gops->gr_ctx = gp106_ops.gr_ctx;
         gops->fecs_trace = gp106_ops.fecs_trace;
         gops->pramin = gp106_ops.pramin;
+        gops->therm = gp106_ops.therm;
         gops->mc = gp106_ops.mc;
         gops->debug = gp106_ops.debug;
         gops->dbg_session_ops = gp106_ops.dbg_session_ops;
@@ -467,7 +478,6 @@ int gp106_init_hal(struct gk20a *g)
         gp106_init_clk_ops(gops);
         gp106_init_clk_arb_ops(gops);
         gp106_init_regops(gops);
-        gp106_init_therm_ops(gops);
 
         g->name = "gp10x";
 
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
index dacebe93..4be8e6cd 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.c
@@ -11,6 +11,8 @@
  * more details.
  */
 
+#include "gk20a/gk20a.h"
+
 #include "therm_gp106.h"
 #include "therm/thrmpmu.h"
 
@@ -22,13 +24,13 @@
 
 #include <nvgpu/hw/gp106/hw_therm_gp106.h>
 
-static void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8)
+void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8)
 {
         *max_24_8 = (0x87 << 8);
         *min_24_8 = ((-216) << 8);
 }
 
-static int gp106_get_internal_sensor_curr_temp(struct gk20a *g, u32 *temp_f24_8)
+int gp106_get_internal_sensor_curr_temp(struct gk20a *g, u32 *temp_f24_8)
 {
         int err = 0;
         u32 readval;
@@ -68,7 +70,8 @@ static int therm_get_internal_sensor_curr_temp(void *data, u64 *val)
 }
 DEFINE_SIMPLE_ATTRIBUTE(therm_ctrl_fops, therm_get_internal_sensor_curr_temp, NULL, "%llu\n");
 
-static void gp106_therm_debugfs_init(struct gk20a *g) {
+void gp106_therm_debugfs_init(struct gk20a *g)
+{
         struct gk20a_platform *platform = dev_get_drvdata(dev_from_gk20a(g));
         struct dentry *dbgentry;
 
@@ -79,7 +82,7 @@ static void gp106_therm_debugfs_init(struct gk20a *g) {
 }
 #endif
 
-static int gp106_elcg_init_idle_filters(struct gk20a *g)
+int gp106_elcg_init_idle_filters(struct gk20a *g)
 {
         u32 gate_ctrl, idle_filter;
         u32 engine_id;
@@ -117,7 +120,7 @@ static int gp106_elcg_init_idle_filters(struct gk20a *g)
         return 0;
 }
 
-static u32 gp106_configure_therm_alert(struct gk20a *g, s32 curr_warn_temp)
+u32 gp106_configure_therm_alert(struct gk20a *g, s32 curr_warn_temp)
 {
         u32 err = 0;
 
@@ -128,14 +131,3 @@ static u32 gp106_configure_therm_alert(struct gk20a *g, s32 curr_warn_temp)
 
         return err;
 }
-
-void gp106_init_therm_ops(struct gpu_ops *gops) {
-#ifdef CONFIG_DEBUG_FS
-        gops->therm.therm_debugfs_init = gp106_therm_debugfs_init;
-#endif
-        gops->therm.elcg_init_idle_filters = gp106_elcg_init_idle_filters;
-        gops->therm.get_internal_sensor_curr_temp = gp106_get_internal_sensor_curr_temp;
-        gops->therm.get_internal_sensor_limits =
-                        gp106_get_internal_sensor_limits;
-        gops->therm.configure_therm_alert = gp106_configure_therm_alert;
-}
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.h b/drivers/gpu/nvgpu/gp106/therm_gp106.h
index 6db17c47..2866320b 100644
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.h
+++ b/drivers/gpu/nvgpu/gp106/therm_gp106.h
@@ -1,7 +1,7 @@
 /*
  * general thermal control structures & definitions
  *
- * Copyright (c) 2016, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2016-2017, 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,7 +16,14 @@
 #ifndef NVGPU_THERM_GP106_H
 #define NVGPU_THERM_GP106_H
 
-#include "gk20a/gk20a.h"
+struct gk20a;
+
+void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8);
+int gp106_get_internal_sensor_curr_temp(struct gk20a *g, u32 *temp_f24_8);
+#ifdef CONFIG_DEBUG_FS
+void gp106_therm_debugfs_init(struct gk20a *g);
+#endif
+int gp106_elcg_init_idle_filters(struct gk20a *g);
+u32 gp106_configure_therm_alert(struct gk20a *g, s32 curr_warn_temp);
 
-void gp106_init_therm_ops(struct gpu_ops *gops);
 #endif