diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/gp10b')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c | 19 |
1 files changed, 0 insertions, 19 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c index 6806b318..78f88d4d 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c | |||
@@ -539,7 +539,6 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
539 | __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); | 539 | __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); |
540 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); | 540 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); |
541 | 541 | ||
542 | #ifdef CONFIG_TEGRA_ACR | ||
543 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { | 542 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { |
544 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); | 543 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); |
545 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | 544 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); |
@@ -557,24 +556,6 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
557 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | 556 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); |
558 | } | 557 | } |
559 | } | 558 | } |
560 | #else | ||
561 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { | ||
562 | gk20a_dbg_info("running simulator with PRIV security disabled"); | ||
563 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); | ||
564 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | ||
565 | } else { | ||
566 | val = gk20a_readl(g, fuse_opt_priv_sec_en_r()); | ||
567 | if (val) { | ||
568 | gk20a_dbg_info("priv security is not supported but enabled"); | ||
569 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); | ||
570 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); | ||
571 | return -EPERM; | ||
572 | } else { | ||
573 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); | ||
574 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | ||
575 | } | ||
576 | } | ||
577 | #endif | ||
578 | 559 | ||
579 | /* priv security dependent ops */ | 560 | /* priv security dependent ops */ |
580 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { | 561 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { |