gpu: nvgpu: Remove privsecurity flag from gpu_ops

Replace privsecurity boolean flag in gpu_ops with entry in
common flag system.

The new common flag is NVGPU_SEC_PRIVSECURITY

Jira NVGPU-74

Change-Id: I4b258f5ffbe30a6344ffba0ece51c6f5d47ebec1
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1525713
Reviewed-by: Automatic_Commit_Validation_User
Reviewed-by: Alex Waterman <alexw@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>

1 files changed, 9 insertions, 9 deletions

diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
index 818949f0..6b4fbf40 100644
--- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
+++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c
@@ -368,49 +368,49 @@ int gp10b_init_hal(struct gk20a *g)
 
 #ifdef CONFIG_TEGRA_ACR
         if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
-                gops->privsecurity = 0;
+                __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
                 __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
         } else if (g->is_virtual) {
-                gops->privsecurity = 1;
+                __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
                 __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true);
         } else {
                 val = gk20a_readl(g, fuse_opt_priv_sec_en_r());
                 if (val) {
-                        gops->privsecurity = 1;
+                        __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
                         __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true);
                 } else {
                         gk20a_dbg_info("priv security is disabled in HW");
-                        gops->privsecurity = 0;
+                        __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
                         __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
                 }
         }
 #else
         if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) {
                 gk20a_dbg_info("running simulator with PRIV security disabled");
-                gops->privsecurity = 0;
+                __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
                 __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
         } else {
                 val = gk20a_readl(g, fuse_opt_priv_sec_en_r());
                 if (val) {
                         gk20a_dbg_info("priv security is not supported but enabled");
-                        gops->privsecurity = 1;
+                        __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true);
                         __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true);
                         return -EPERM;
                 } else {
-                        gops->privsecurity = 0;
+                        __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false);
                         __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false);
                 }
         }
 #endif
 
         g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
-        gp10b_init_gr(gops);
+        gp10b_init_gr(g);
         gp10b_init_fecs_trace_ops(gops);
         gp10b_init_fb(gops);
         gp10b_init_ce(gops);
         gp10b_init_gr_ctx(gops);
         gp10b_init_mm(gops);
-        gp10b_init_pmu_ops(gops);
+        gp10b_init_pmu_ops(g);
         gp10b_init_regops(gops);
         gp10b_init_therm_ops(gops);
         gk20a_init_pramin_ops(gops);