gpu: nvgpu: Add dGPU clocks support

JIRA DNVGPU-45

Change-Id: I237ce81e31b036c05c82d46eea8694ffe1c2e3df
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Signed-off-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/1205849
(cherry picked from commit 9a4006f76b75a8ad525e7aa5ad1f609aaae49126)
Reviewed-on: http://git-master/r/1227256
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

3 files changed, 40 insertions, 7 deletions

diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.c b/drivers/gpu/nvgpu/gm206/bios_gm206.c
index 6caecb32..21c852a5 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.c
@@ -61,6 +61,7 @@ struct bit {
 #define TOKEN_ID_FALCON_DATA 0x70
 #define TOKEN_ID_PERF_PTRS 0x50
 #define TOKEN_ID_CLOCK_PTRS 0x43
+#define TOKEN_ID_VIRT_PTRS 0x56
 
 struct nvinit_ptrs {
         u16 initscript_table_ptr;
@@ -434,17 +435,29 @@ static void *gm206_bios_get_perf_table_ptrs(struct gk20a *g,
 {
         u32 perf_table_id_offset = 0;
         u8 *perf_table_ptr = NULL;
+        u8 data_size = 4;
 
-        if (ptoken != NULL &&
-                table_id < (ptoken->data_size/sizeof(u32))) {
+        if (ptoken != NULL) {
 
-                perf_table_id_offset = *((u32 *)&g->bios.data[
+                if (ptoken->token_id == TOKEN_ID_VIRT_PTRS) {
+                        perf_table_id_offset = *((u16 *)&g->bios.data[
+                                ptoken->data_ptr +
+                                (table_id * PERF_PTRS_WIDTH_16)]);
+                        data_size = PERF_PTRS_WIDTH_16;
+                } else {
+                        perf_table_id_offset = *((u32 *)&g->bios.data[
                                 ptoken->data_ptr +
                                 (table_id * PERF_PTRS_WIDTH)]);
+                        data_size = PERF_PTRS_WIDTH;
+                }
+        } else
+                return (void *)perf_table_ptr;
+
+        if (table_id < (ptoken->data_size/data_size)) {
 
                 gk20a_dbg_info("Perf_Tbl_ID-offset 0x%x Tbl_ID_Ptr-offset- 0x%x",
                                         (ptoken->data_ptr +
-                                        (table_id * PERF_PTRS_WIDTH)),
+                                        (table_id * data_size)),
                                         perf_table_id_offset);
 
                 if (perf_table_id_offset != 0) {
@@ -503,6 +516,10 @@ static void gm206_bios_parse_bit(struct gk20a *g, int offset)
                         g->bios.clock_token =
                                 (struct bit_token *)&g->bios.data[offset];
                         break;
+                case TOKEN_ID_VIRT_PTRS:
+                        g->bios.virt_token =
+                                (struct bit_token *)&g->bios.data[offset];
+                        break;
                 default:
                         break;
                 }
diff --git a/drivers/gpu/nvgpu/gm206/bios_gm206.h b/drivers/gpu/nvgpu/gm206/bios_gm206.h
index f93e5f58..5aa20364 100644
--- a/drivers/gpu/nvgpu/gm206/bios_gm206.h
+++ b/drivers/gpu/nvgpu/gm206/bios_gm206.h
@@ -15,18 +15,34 @@
 #define NVGPU_BIOS_GM206_H
 
 #define PERF_PTRS_WIDTH 0x4
+#define PERF_PTRS_WIDTH_16 0x2
 
 enum {
         CLOCKS_TABLE = 2,
         CLOCK_PROGRAMMING_TABLE,
-        NAFLL_TABLE,
-        ADC_TABLE,
+        FLL_TABLE,
+        VIN_TABLE,
+        FREQUENCY_CONTROLLER_TABLE
 };
 
 enum {
+        PERFORMANCE_TABLE = 0,
+        MEMORY_CLOCK_TABLE,
+        MEMORY_TWEAK_TABLE,
+        POWER_CONTROL_TABLE,
+        THERMAL_CONTROL_TABLE,
+        THERMAL_DEVICE_TABLE,
+        THERMAL_COOLERS_TABLE,
+        PERFORMANCE_SETTINGS_SCRIPT,
         CONTINUOUS_VIRTUAL_BINNING_TABLE,
 };
 
+enum {
+        VP_FIELD_TABLE = 0,
+        VP_FIELD_REGISTER,
+        VP_TRANSLATION_TABLE,
+};
+
 struct bit_token {
         u8 token_id;
         u8 data_version;
diff --git a/drivers/gpu/nvgpu/gm206/hal_gm206.c b/drivers/gpu/nvgpu/gm206/hal_gm206.c
index 6b43c8e9..f771c07d 100644
--- a/drivers/gpu/nvgpu/gm206/hal_gm206.c
+++ b/drivers/gpu/nvgpu/gm206/hal_gm206.c
@@ -181,7 +181,7 @@ int gm206_init_hal(struct gk20a *g)
 
         gops->privsecurity = 1;
         gops->securegpccs = 1;
-
+        gops->pmupstate = false;
         gm20b_init_mc(gops);
         gm20b_init_ltc(gops);
         gm206_init_gr(gops);