gpu: nvgpu: update PMU version & params

- Update PMU version to support r370
- flcn_bl_dmem_desc_v1 params update to
  support PMU bootloader
- PMU_UNIT_CLK value update

JIRA DNVGPU-116

Change-Id: Ic4096e4a5ea55ca6b7c72670061e55b4719e0895
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: http://git-master/r/1212834
(cherry picked from commit 32257231733303b0859230719f3857ad2d9d8820)
Reviewed-on: http://git-master/r/1227289
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit

2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
index fd27ab5c..78a37436 100644
--- a/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/pmu_gk20a.h
@@ -38,7 +38,7 @@
 #define APP_VERSION_NC_1        20313802
 #define APP_VERSION_NC_0        20360931
 #define APP_VERSION_GM206       20652057
-#define APP_VERSION_NV_GPU      20660622
+#define APP_VERSION_NV_GPU      21082352
 #define APP_VERSION_NV_GPU_1    20799797
 #define APP_VERSION_GM20B_5 20490253
 #define APP_VERSION_GM20B_4 19008461
@@ -178,7 +178,7 @@ struct pmu_ucode_desc_v1 {
 #define PMU_UNIT_PERF            (0x13)
 #define PMU_UNIT_RC             (0x1F)
 #define PMU_UNIT_FECS_MEM_OVERRIDE      (0x1E)
-#define PMU_UNIT_CLK             (0x1C)
+#define PMU_UNIT_CLK             (0x0D)
 
 #define PMU_UNIT_END            (0x23)
 
@@ -255,10 +255,11 @@ struct pmu_init_msg_pmu_v2 {
         u8 dummy[18];
 };
 
+#define PMU_QUEUE_COUNT_FOR_V3 3
 struct pmu_init_msg_pmu_v3 {
         u8 msg_type;
-        u8  queue_index[PMU_QUEUE_COUNT];
-        u16 queue_size[PMU_QUEUE_COUNT];
+        u8  queue_index[PMU_QUEUE_COUNT_FOR_V3];
+        u16 queue_size[PMU_QUEUE_COUNT_FOR_V3];
         u16 queue_offset;
 
         u16 sw_managed_area_offset;
diff --git a/drivers/gpu/nvgpu/gm206/acr_gm206.h b/drivers/gpu/nvgpu/gm206/acr_gm206.h
index 86bc642a..b0ccbf9c 100644
--- a/drivers/gpu/nvgpu/gm206/acr_gm206.h
+++ b/drivers/gpu/nvgpu/gm206/acr_gm206.h
@@ -42,6 +42,8 @@ struct flcn_bl_dmem_desc_v1 {
         u32    code_entry_point;
         struct falc_u64 data_dma_base;
         u32    data_size;
+        u32 argc;
+        u32 argv;
 };
 
 /*!