diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/gp10b/vgpu_hal_gp10b.c | 27 |
1 files changed, 9 insertions, 18 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 78f88d4d..b35cac90 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 | |||
@@ -27,6 +27,7 @@ | |||
27 | #include "common/linux/vgpu/gm20b/vgpu_gr_gm20b.h" | 27 | #include "common/linux/vgpu/gm20b/vgpu_gr_gm20b.h" |
28 | #include "vgpu_gr_gp10b.h" | 28 | #include "vgpu_gr_gp10b.h" |
29 | #include "vgpu_mm_gp10b.h" | 29 | #include "vgpu_mm_gp10b.h" |
30 | #include "vgpu_fuse_gp10b.h" | ||
30 | 31 | ||
31 | #include "gk20a/bus_gk20a.h" | 32 | #include "gk20a/bus_gk20a.h" |
32 | #include "gk20a/pramin_gk20a.h" | 33 | #include "gk20a/pramin_gk20a.h" |
@@ -498,6 +499,9 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
498 | .priv_ring = { | 499 | .priv_ring = { |
499 | .isr = gp10b_priv_ring_isr, | 500 | .isr = gp10b_priv_ring_isr, |
500 | }, | 501 | }, |
502 | .fuse = { | ||
503 | .check_priv_security = vgpu_gp10b_fuse_check_priv_security, | ||
504 | }, | ||
501 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, | 505 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, |
502 | .get_litter_value = gp10b_get_litter_value, | 506 | .get_litter_value = gp10b_get_litter_value, |
503 | }; | 507 | }; |
@@ -505,7 +509,6 @@ static const struct gpu_ops vgpu_gp10b_ops = { | |||
505 | int vgpu_gp10b_init_hal(struct gk20a *g) | 509 | int vgpu_gp10b_init_hal(struct gk20a *g) |
506 | { | 510 | { |
507 | struct gpu_ops *gops = &g->ops; | 511 | struct gpu_ops *gops = &g->ops; |
508 | u32 val; | ||
509 | 512 | ||
510 | gops->ltc = vgpu_gp10b_ops.ltc; | 513 | gops->ltc = vgpu_gp10b_ops.ltc; |
511 | gops->ce2 = vgpu_gp10b_ops.ce2; | 514 | gops->ce2 = vgpu_gp10b_ops.ce2; |
@@ -531,6 +534,8 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
531 | 534 | ||
532 | gops->priv_ring = vgpu_gp10b_ops.priv_ring; | 535 | gops->priv_ring = vgpu_gp10b_ops.priv_ring; |
533 | 536 | ||
537 | gops->fuse = vgpu_gp10b_ops.fuse; | ||
538 | |||
534 | /* Lone Functions */ | 539 | /* Lone Functions */ |
535 | gops->chip_init_gpu_characteristics = | 540 | gops->chip_init_gpu_characteristics = |
536 | vgpu_gp10b_ops.chip_init_gpu_characteristics; | 541 | vgpu_gp10b_ops.chip_init_gpu_characteristics; |
@@ -539,23 +544,9 @@ int vgpu_gp10b_init_hal(struct gk20a *g) | |||
539 | __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); | 544 | __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); |
540 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); | 545 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); |
541 | 546 | ||
542 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { | 547 | /* Read fuses to check if gpu needs to boot in secure/non-secure mode */ |
543 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); | 548 | if (gops->fuse.check_priv_security(g)) |
544 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | 549 | return -EINVAL; /* Do not boot gpu */ |
545 | } else if (g->is_virtual) { | ||
546 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); | ||
547 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); | ||
548 | } else { | ||
549 | val = gk20a_readl(g, fuse_opt_priv_sec_en_r()); | ||
550 | if (val) { | ||
551 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); | ||
552 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, true); | ||
553 | } else { | ||
554 | gk20a_dbg_info("priv security is disabled in HW"); | ||
555 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); | ||
556 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | ||
557 | } | ||
558 | } | ||
559 | 550 | ||
560 | /* priv security dependent ops */ | 551 | /* priv security dependent ops */ |
561 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { | 552 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { |