gpu: nvgpu: Move therm HAL to common

Move implementation of therm HAL to common/therm. ELCG and BLCG
code was embedded in gr HAL, so moved that code to therm.

Bump gk20a code to gm20b.

JIRA NVGPU-955

Change-Id: I9b03e52f2832d3a1d89071a577e8ce106aaf603b
Signed-off-by: Terje Bergstrom <tbergstrom@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1795989
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 4 insertions, 184 deletions

diff --git a/drivers/gpu/nvgpu/gp106/hal_gp106.c b/drivers/gpu/nvgpu/gp106/hal_gp106.c
index 90d25fa0..02a2f0a6 100644
--- a/drivers/gpu/nvgpu/gp106/hal_gp106.c
+++ b/drivers/gpu/nvgpu/gp106/hal_gp106.c
@@ -34,6 +34,8 @@
 #include "common/fb/fb_gm20b.h"
 #include "common/fb/fb_gp106.h"
 #include "common/xve/xve_gp106.h"
+#include "common/therm/therm_gm20b.h"
+#include "common/therm/therm_gp106.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/fifo_gk20a.h"
@@ -76,7 +78,6 @@
 #include "gp106/clk_arb_gp106.h"
 #include "gp106/mclk_gp106.h"
 #include "gp106/bios_gp106.h"
-#include "gp106/therm_gp106.h"
 #include "gp106/fifo_gp106.h"
 #include "gp106/clk_gp106.h"
 #include "gp106/mm_gp106.h"
@@ -349,7 +350,6 @@ static const struct gpu_ops gp106_ops = {
                 .commit_inst = gr_gk20a_commit_inst,
                 .write_zcull_ptr = gr_gk20a_write_zcull_ptr,
                 .write_pm_ptr = gr_gk20a_write_pm_ptr,
-                .init_elcg_mode = gr_gk20a_init_elcg_mode,
                 .load_tpc_mask = gr_gm20b_load_tpc_mask,
                 .inval_icache = gr_gk20a_inval_icache,
                 .trigger_suspend = gr_gk20a_trigger_suspend,
@@ -606,6 +606,8 @@ static const struct gpu_ops gp106_ops = {
 #ifdef CONFIG_DEBUG_FS
                 .therm_debugfs_init = gp106_therm_debugfs_init,
 #endif /* CONFIG_DEBUG_FS */
+                .init_elcg_mode = gm20b_therm_init_elcg_mode,
+                .init_blcg_mode = gm20b_therm_init_blcg_mode,
                 .elcg_init_idle_filters = gp106_elcg_init_idle_filters,
                 .get_internal_sensor_curr_temp =
                         gp106_get_internal_sensor_curr_temp,
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.c b/drivers/gpu/nvgpu/gp106/therm_gp106.c
deleted file mode 100644
index 1f82aa7a..00000000
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.c
+++ /dev/null
@@ -1,144 +0,0 @@
-/*
- * Copyright (c) 2016-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.
- */
-
-#include <nvgpu/io.h>
-#include "gk20a/gk20a.h"
-
-#include "therm_gp106.h"
-#include "therm/thrmpmu.h"
-
-#ifdef CONFIG_DEBUG_FS
-#include <linux/debugfs.h>
-#include "os/linux/os_linux.h"
-#endif
-
-#include <nvgpu/hw/gp106/hw_therm_gp106.h>
-
-#include <nvgpu/utils.h>
-
-void gp106_get_internal_sensor_limits(s32 *max_24_8, s32 *min_24_8)
-{
-        *max_24_8 = (0x87 << 8);
-        *min_24_8 = (((u32)-216) << 8);
-}
-
-int gp106_get_internal_sensor_curr_temp(struct gk20a *g, u32 *temp_f24_8)
-{
-        int err = 0;
-        u32 readval;
-
-        readval = gk20a_readl(g, therm_temp_sensor_tsense_r());
-
-        if (!(therm_temp_sensor_tsense_state_v(readval) &
-                therm_temp_sensor_tsense_state_valid_v())) {
-                nvgpu_err(g,
-                        "Attempt to read temperature while sensor is OFF!");
-                err = -EINVAL;
-        } else if (therm_temp_sensor_tsense_state_v(readval) &
-                therm_temp_sensor_tsense_state_shadow_v()) {
-                nvgpu_err(g, "Reading temperature from SHADOWed sensor!");
-        }
-
-        // Convert from F9.5 -> F27.5 -> F24.8.
-        readval &= therm_temp_sensor_tsense_fixed_point_m();
-
-        *temp_f24_8 = readval;
-
-        return err;
-}
-
-#ifdef CONFIG_DEBUG_FS
-static int therm_get_internal_sensor_curr_temp(void *data, u64 *val)
-{
-        struct gk20a *g = (struct gk20a *)data;
-        u32 readval;
-        int err;
-
-        err = gp106_get_internal_sensor_curr_temp(g, &readval);
-        if (!err)
-                *val = readval;
-
-        return err;
-}
-DEFINE_SIMPLE_ATTRIBUTE(therm_ctrl_fops, therm_get_internal_sensor_curr_temp, NULL, "%llu\n");
-
-void gp106_therm_debugfs_init(struct gk20a *g)
-{
-        struct nvgpu_os_linux *l = nvgpu_os_linux_from_gk20a(g);
-        struct dentry *dbgentry;
-
-        dbgentry = debugfs_create_file(
-                "temp", S_IRUGO, l->debugfs, g, &therm_ctrl_fops);
-        if (!dbgentry)
-                nvgpu_err(g, "debugfs entry create failed for therm_curr_temp");
-}
-#endif
-
-int gp106_elcg_init_idle_filters(struct gk20a *g)
-{
-        u32 gate_ctrl, idle_filter;
-        u32 engine_id;
-        u32 active_engine_id = 0;
-        struct fifo_gk20a *f = &g->fifo;
-
-        nvgpu_log_fn(g, " ");
-
-        for (engine_id = 0; engine_id < f->num_engines; engine_id++) {
-                active_engine_id = f->active_engines_list[engine_id];
-                gate_ctrl = gk20a_readl(g, therm_gate_ctrl_r(active_engine_id));
-
-                gate_ctrl = set_field(gate_ctrl,
-                        therm_gate_ctrl_eng_idle_filt_exp_m(),
-                        therm_gate_ctrl_eng_idle_filt_exp_f(2));
-                gate_ctrl = set_field(gate_ctrl,
-                        therm_gate_ctrl_eng_idle_filt_mant_m(),
-                        therm_gate_ctrl_eng_idle_filt_mant_f(1));
-                gate_ctrl = set_field(gate_ctrl,
-                        therm_gate_ctrl_eng_delay_before_m(),
-                        therm_gate_ctrl_eng_delay_before_f(0));
-                gk20a_writel(g, therm_gate_ctrl_r(active_engine_id), gate_ctrl);
-        }
-
-        /* default fecs_idle_filter to 0 */
-        idle_filter = gk20a_readl(g, therm_fecs_idle_filter_r());
-        idle_filter &= ~therm_fecs_idle_filter_value_m();
-        gk20a_writel(g, therm_fecs_idle_filter_r(), idle_filter);
-        /* default hubmmu_idle_filter to 0 */
-        idle_filter = gk20a_readl(g, therm_hubmmu_idle_filter_r());
-        idle_filter &= ~therm_hubmmu_idle_filter_value_m();
-        gk20a_writel(g, therm_hubmmu_idle_filter_r(), idle_filter);
-
-        nvgpu_log_fn(g, "done");
-        return 0;
-}
-
-u32 gp106_configure_therm_alert(struct gk20a *g, s32 curr_warn_temp)
-{
-        u32 err = 0;
-
-        if (g->curr_warn_temp != curr_warn_temp) {
-                g->curr_warn_temp = curr_warn_temp;
-                err = therm_configure_therm_alert(g);
-        }
-
-        return err;
-}
diff --git a/drivers/gpu/nvgpu/gp106/therm_gp106.h b/drivers/gpu/nvgpu/gp106/therm_gp106.h
deleted file mode 100644
index 5debcee7..00000000
--- a/drivers/gpu/nvgpu/gp106/therm_gp106.h
+++ /dev/null
@@ -1,38 +0,0 @@
-/*
- * general thermal control structures & definitions
- *
- * Copyright (c) 2016-2017, 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 NVGPU_THERM_GP106_H
-#define NVGPU_THERM_GP106_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);
-
-#endif