gpu: nvgpu: update thermal programming

Add required fileds and values for thermal slow-down
settings in thermal header file and implemented chip
specific thermal register programming

Reviewed-on: http://git-master/r/822199
(cherry picked from commit 9e8a745b8295af002b9780c83caa8dc7b22cc737)

Change-Id: I016b18ed230fa6c104eada2e166ccd1a5f2ace36
Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com>
Reviewed-on: http://git-master/r/823012
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

5 files changed, 75 insertions, 14 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index 1cf90fbf..328bb73b 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -388,6 +388,9 @@ struct gpu_ops {
                                          u32 flags);
         } mm;
         struct {
+                int (*init_therm_setup_hw)(struct gk20a *g);
+        } therm;
+        struct {
                 int (*prepare_ucode)(struct gk20a *g);
                 int (*pmu_setup_hw_and_bootstrap)(struct gk20a *g);
                 int (*pmu_nsbootstrap)(struct pmu_gk20a *pmu);
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
index b8268e1f..a9ad970a 100644
--- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
@@ -27,6 +27,7 @@
 #include "pmu_gk20a.h"
 #include "clk_gk20a.h"
 #include "regops_gk20a.h"
+#include "therm_gk20a.h"
 
 static struct gpu_ops gk20a_ops = {
         .clock_gating = {
@@ -65,6 +66,7 @@ int gk20a_init_hal(struct gk20a *g)
         gk20a_init_clk_ops(gops);
         gk20a_init_regops(gops);
         gk20a_init_debug_ops(gops);
+        gk20a_init_therm_ops(gops);
         gops->name = "gk20a";
 
         c->twod_class = FERMI_TWOD_A;
diff --git a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h b/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h
index 67f1bbc2..d4c04116 100644
--- a/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/hw_therm_gk20a.h
@@ -54,18 +54,66 @@ static inline u32 therm_use_a_r(void)
 {
         return 0x00020798;
 }
+static inline u32 therm_use_a_ext_therm_0_enable_f(void)
+{
+        return 0x1;
+}
+static inline u32 therm_use_a_ext_therm_1_enable_f(void)
+{
+        return 0x2;
+}
+static inline u32 therm_use_a_ext_therm_2_enable_f(void)
+{
+        return 0x4;
+}
 static inline u32 therm_evt_ext_therm_0_r(void)
 {
         return 0x00020700;
 }
+static inline u32 therm_evt_ext_therm_0_slow_factor_f(u32 v)
+{
+        return (v & 0x3f) << 8;
+}
+static inline u32 therm_evt_ext_therm_0_slow_factor_init_v(void)
+{
+        return 0x00000000;
+}
+static inline u32 therm_evt_ext_therm_0_priority_f(u32 v)
+{
+        return (v & 0x1f) << 24;
+}
 static inline u32 therm_evt_ext_therm_1_r(void)
 {
         return 0x00020704;
 }
+static inline u32 therm_evt_ext_therm_1_slow_factor_f(u32 v)
+{
+        return (v & 0x3f) << 8;
+}
+static inline u32 therm_evt_ext_therm_1_slow_factor_init_v(void)
+{
+        return 0x00000000;
+}
+static inline u32 therm_evt_ext_therm_1_priority_f(u32 v)
+{
+        return (v & 0x1f) << 24;
+}
 static inline u32 therm_evt_ext_therm_2_r(void)
 {
         return 0x00020708;
 }
+static inline u32 therm_evt_ext_therm_2_slow_factor_f(u32 v)
+{
+        return (v & 0x3f) << 8;
+}
+static inline u32 therm_evt_ext_therm_2_slow_factor_init_v(void)
+{
+        return 0x00000000;
+}
+static inline u32 therm_evt_ext_therm_2_priority_f(u32 v)
+{
+        return (v & 0x1f) << 24;
+}
 static inline u32 therm_weight_1_r(void)
 {
         return 0x00020024;
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
index fd4149ae..1c1b8419 100644
--- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.c
@@ -3,7 +3,7 @@
  *
  * GK20A Therm
  *
- * Copyright (c) 2011-2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011-2015, 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,
@@ -38,13 +38,20 @@ static int gk20a_init_therm_setup_hw(struct gk20a *g)
         u32 v;
 
         /* program NV_THERM registers */
-        gk20a_writel(g, therm_use_a_r(), NV_THERM_USE_A_INIT);
+        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());
+        /* priority for EXT_THERM_0 event set to highest */
         gk20a_writel(g, therm_evt_ext_therm_0_r(),
-                NV_THERM_EVT_EXT_THERM_0_INIT);
+                therm_evt_ext_therm_0_slow_factor_f(1) |
+                therm_evt_ext_therm_0_priority_f(3));
         gk20a_writel(g, therm_evt_ext_therm_1_r(),
-                NV_THERM_EVT_EXT_THERM_1_INIT);
+                therm_evt_ext_therm_1_slow_factor_f(2) |
+                therm_evt_ext_therm_1_priority_f(2));
         gk20a_writel(g, therm_evt_ext_therm_2_r(),
-                NV_THERM_EVT_EXT_THERM_2_INIT);
+                therm_evt_ext_therm_2_slow_factor_f(3) |
+                therm_evt_ext_therm_2_priority_f(1));
+
 
         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()) |
@@ -92,9 +99,15 @@ int gk20a_init_therm_support(struct gk20a *g)
         if (err)
                 return err;
 
-        err = gk20a_init_therm_setup_hw(g);
+        if (g->ops.therm.init_therm_setup_hw)
+                err = g->ops.therm.init_therm_setup_hw(g);
         if (err)
                 return err;
 
         return err;
 }
+
+void gk20a_init_therm_ops(struct gpu_ops *gops)
+{
+        gops->therm.init_therm_setup_hw = gk20a_init_therm_setup_hw;
+}
diff --git a/drivers/gpu/nvgpu/gk20a/therm_gk20a.h b/drivers/gpu/nvgpu/gk20a/therm_gk20a.h
index e670ec0e..80671d68 100644
--- a/drivers/gpu/nvgpu/gk20a/therm_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/therm_gk20a.h
@@ -1,5 +1,5 @@
 /*
- * Copyright (c) 2011 - 2014, NVIDIA CORPORATION.  All rights reserved.
+ * Copyright (c) 2011 - 2015, 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,13 +16,8 @@
 #ifndef THERM_GK20A_H
 #define THERM_GK20A_H
 
-/* priority for EXT_THERM_0 event set to highest */
-#define NV_THERM_EVT_EXT_THERM_0_INIT   0x3000100
-#define NV_THERM_EVT_EXT_THERM_1_INIT   0x2000200
-#define NV_THERM_EVT_EXT_THERM_2_INIT   0x1000300
-/* configures the thermal events that may cause clock slowdown */
-#define NV_THERM_USE_A_INIT     0x7
+struct gpu_ops;
+void gk20a_init_therm_ops(struct gpu_ops *gops);
 
 int gk20a_init_therm_support(struct gk20a *g);
-
 #endif /* THERM_GK20A_H */