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, 5 insertions, 113 deletions

diff --git a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
index e6c4c8d1..05acc0cf 100644
--- a/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/hal_gm20b.c
@@ -29,12 +29,13 @@
 #include "common/ptimer/ptimer_gk20a.h"
 #include "common/fb/fb_gk20a.h"
 #include "common/fb/fb_gm20b.h"
+#include "common/therm/therm_gm20b.h"
+#include "common/therm/therm_gm20b.h"
 
 #include "gk20a/gk20a.h"
 #include "gk20a/ce2_gk20a.h"
 #include "gk20a/dbg_gpu_gk20a.h"
 #include "gk20a/fifo_gk20a.h"
-#include "gk20a/therm_gk20a.h"
 #include "gk20a/mm_gk20a.h"
 #include "gk20a/css_gr_gk20a.h"
 #include "gk20a/mc_gk20a.h"
@@ -53,7 +54,6 @@
 #include "pmu_gm20b.h"
 #include "clk_gm20b.h"
 #include "regops_gm20b.h"
-#include "therm_gm20b.h"
 #include "hal_gm20b.h"
 #include "acr_gm20b.h"
 #include "fuse_gm20b.h"
@@ -291,7 +291,6 @@ static const struct gpu_ops gm20b_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,
@@ -512,7 +511,9 @@ static const struct gpu_ops gm20b_ops = {
         },
         .therm = {
                 .init_therm_setup_hw = gm20b_init_therm_setup_hw,
-                .elcg_init_idle_filters = gk20a_elcg_init_idle_filters,
+                .init_elcg_mode = gm20b_therm_init_elcg_mode,
+                .init_blcg_mode = gm20b_therm_init_blcg_mode,
+                .elcg_init_idle_filters = gm20b_elcg_init_idle_filters,
         },
         .pmu = {
                 .pmu_setup_elpg = gm20b_pmu_setup_elpg,
diff --git a/drivers/gpu/nvgpu/gm20b/therm_gm20b.c b/drivers/gpu/nvgpu/gm20b/therm_gm20b.c
deleted file mode 100644
index e2055376..00000000
--- a/drivers/gpu/nvgpu/gm20b/therm_gm20b.c
+++ /dev/null
@@ -1,79 +0,0 @@
-/*
- * GM20B THERMAL
- *
- * Copyright (c) 2015-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_gm20b.h"
-
-#include <nvgpu/hw/gm20b/hw_therm_gm20b.h>
-
-int gm20b_init_therm_setup_hw(struct gk20a *g)
-{
-        u32 v;
-
-        nvgpu_log_fn(g, " ");
-
-        /* program NV_THERM registers */
-        gk20a_writel(g, therm_use_a_r(), therm_use_a_ext_therm_0_enable_f() |
-                        therm_use_a_ext_therm_1_enable_f()  |
-                        therm_use_a_ext_therm_2_enable_f());
-        gk20a_writel(g, therm_evt_ext_therm_0_r(),
-                        therm_evt_ext_therm_0_slow_factor_f(0x2));
-        gk20a_writel(g, therm_evt_ext_therm_1_r(),
-                        therm_evt_ext_therm_1_slow_factor_f(0x6));
-        gk20a_writel(g, therm_evt_ext_therm_2_r(),
-                        therm_evt_ext_therm_2_slow_factor_f(0xe));
-
-        gk20a_writel(g, therm_grad_stepping_table_r(0),
-                therm_grad_stepping_table_slowdown_factor0_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by1p5_f()) |
-                therm_grad_stepping_table_slowdown_factor1_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by2_f()) |
-                therm_grad_stepping_table_slowdown_factor2_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by4_f()) |
-                therm_grad_stepping_table_slowdown_factor3_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()) |
-                therm_grad_stepping_table_slowdown_factor4_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()));
-        gk20a_writel(g, therm_grad_stepping_table_r(1),
-                therm_grad_stepping_table_slowdown_factor0_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()) |
-                therm_grad_stepping_table_slowdown_factor1_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()) |
-                therm_grad_stepping_table_slowdown_factor2_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()) |
-                therm_grad_stepping_table_slowdown_factor3_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()) |
-                therm_grad_stepping_table_slowdown_factor4_f(therm_grad_stepping_table_slowdown_factor0_fpdiv_by8_f()));
-
-        v = gk20a_readl(g, therm_clk_timing_r(0));
-        v |= therm_clk_timing_grad_slowdown_enabled_f();
-        gk20a_writel(g, therm_clk_timing_r(0), v);
-
-        v = gk20a_readl(g, therm_config2_r());
-        v |= therm_config2_grad_enable_f(1);
-        v |= therm_config2_slowdown_factor_extended_f(1);
-        gk20a_writel(g, therm_config2_r(), v);
-
-        gk20a_writel(g, therm_grad_stepping1_r(),
-                        therm_grad_stepping1_pdiv_duration_f(32));
-
-        v = gk20a_readl(g, therm_grad_stepping0_r());
-        v |= therm_grad_stepping0_feature_enable_f();
-        gk20a_writel(g, therm_grad_stepping0_r(), v);
-
-        return 0;
-}
diff --git a/drivers/gpu/nvgpu/gm20b/therm_gm20b.h b/drivers/gpu/nvgpu/gm20b/therm_gm20b.h
deleted file mode 100644
index df0b4219..00000000
--- a/drivers/gpu/nvgpu/gm20b/therm_gm20b.h
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * GM20B THERMAL
- *
- * Copyright (c) 2015-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 THERM_GM20B_H
-#define THERM_GM20B_H
-
-struct gk20a;
-int gm20b_init_therm_setup_hw(struct gk20a *g);
-
-#endif /* THERM_GM20B_H */