gpu: nvgpu: Update PMU firmware version.

This patch also updates PMU cmdline args as
required by updated firmware.

GPUT19x-30

Change-Id: I44214007046081a44acc7284eb2854d0548a8da8
Signed-off-by: Deepak Goyal <dgoyal@nvidia.com>
Reviewed-on: http://git-master/r/1498188
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

2 files changed, 12 insertions, 0 deletions

diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmu.h b/drivers/gpu/nvgpu/include/nvgpu/pmu.h
index 0fcc5710..687e00ae 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmu.h
@@ -314,6 +314,7 @@ struct nvgpu_pmu {
                 struct pmu_cmdline_args_v3 args_v3;
                 struct pmu_cmdline_args_v4 args_v4;
                 struct pmu_cmdline_args_v5 args_v5;
+                struct pmu_cmdline_args_v6 args_v6;
         };
         unsigned long perfmon_events_cnt;
         bool perfmon_sampling_enabled;
diff --git a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pmu.h b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pmu.h
index 6df92c1d..a8897034 100644
--- a/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pmu.h
+++ b/drivers/gpu/nvgpu/include/nvgpu/pmuif/gpmuif_pmu.h
@@ -77,6 +77,17 @@ struct pmu_cmdline_args_v5 {
         u32 dummy;
 };
 
+struct pmu_cmdline_args_v6 {
+        u32 cpu_freq_hz;
+        struct flcn_mem_desc_v0 trace_buf;
+        u8 secure_mode;
+        u8 raise_priv_sec;
+        struct flcn_mem_desc_v0 gc6_ctx;
+        struct flcn_mem_desc_v0 gc6_bsod_ctx;
+        struct flcn_mem_desc_v0 init_data_dma_info;
+        u32 dummy;
+};
+
 /* GPU ID */
 #define PMU_SHA1_GID_SIGNATURE          0xA7C66AD2
 #define PMU_SHA1_GID_SIGNATURE_SIZE     4