gpu: nvgpu: gm20b: dynamically detect priv security for secure boot of falcon

based on the config setting and fuse secure no non secure boot is done

Change-Id: I5937ba945c5a3a86f72e0f2a9078fcde01977137
Signed-off-by: Vijayakumar <vsubbu@nvidia.com>
Reviewed-on: http://git-master/r/487684
Tested-by: Terje Bergstrom <tbergstrom@nvidia.com>
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>

3 files changed, 5 insertions, 1 deletions

diff --git a/drivers/gpu/nvgpu/gk20a/gk20a.h b/drivers/gpu/nvgpu/gk20a/gk20a.h
index b813541a..de234972 100644
--- a/drivers/gpu/nvgpu/gk20a/gk20a.h
+++ b/drivers/gpu/nvgpu/gk20a/gk20a.h
@@ -297,6 +297,7 @@ struct gpu_ops {
                 int (*init_clk_support)(struct gk20a *g);
                 int (*suspend_clk_support)(struct gk20a *g);
         } clk;
+        bool privsecurity;
 };
 
 struct gk20a {
diff --git a/drivers/gpu/nvgpu/gk20a/hal.c b/drivers/gpu/nvgpu/gk20a/hal.c
index 1aae0304..8d1a29dd 100644
--- a/drivers/gpu/nvgpu/gk20a/hal.c
+++ b/drivers/gpu/nvgpu/gk20a/hal.c
@@ -26,7 +26,9 @@ int gpu_init_hal(struct gk20a *g)
                 gk20a_init_hal(&g->ops);
                 break;
         case GK20A_GPUID_GM20B:
-                gm20b_init_hal(&g->ops);
+                gk20a_dbg_info("gm20b detected");
+                if (gm20b_init_hal(&g->ops))
+                        return -ENODEV;
                 break;
         default:
                 gk20a_err(&g->dev->dev, "no support for %x", ver);
diff --git a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
index 3dae9450..1b8157f1 100644
--- a/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
+++ b/drivers/gpu/nvgpu/gk20a/hal_gk20a.c
@@ -44,6 +44,7 @@ struct gpu_ops gk20a_ops = {
 int gk20a_init_hal(struct gpu_ops *gops)
 {
         *gops = gk20a_ops;
+        gops->privsecurity = 0;
         gk20a_init_ltc(gops);
         gk20a_init_gr_ops(gops);
         gk20a_init_fb(gops);