diff options
Diffstat (limited to 'drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c')
-rw-r--r-- | drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c | 22 |
1 files changed, 9 insertions, 13 deletions
diff --git a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c index b9d3f734..0e560981 100644 --- a/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c +++ b/drivers/gpu/nvgpu/common/linux/vgpu/gm20b/vgpu_hal_gm20b.c | |||
@@ -24,6 +24,7 @@ | |||
24 | #include "common/linux/vgpu/fecs_trace_vgpu.h" | 24 | #include "common/linux/vgpu/fecs_trace_vgpu.h" |
25 | #include "common/linux/vgpu/css_vgpu.h" | 25 | #include "common/linux/vgpu/css_vgpu.h" |
26 | #include "vgpu_gr_gm20b.h" | 26 | #include "vgpu_gr_gm20b.h" |
27 | #include "vgpu_fuse_gm20b.h" | ||
27 | 28 | ||
28 | #include "gk20a/bus_gk20a.h" | 29 | #include "gk20a/bus_gk20a.h" |
29 | #include "gk20a/flcn_gk20a.h" | 30 | #include "gk20a/flcn_gk20a.h" |
@@ -456,6 +457,9 @@ static const struct gpu_ops vgpu_gm20b_ops = { | |||
456 | .priv_ring = { | 457 | .priv_ring = { |
457 | .isr = gk20a_priv_ring_isr, | 458 | .isr = gk20a_priv_ring_isr, |
458 | }, | 459 | }, |
460 | .fuse = { | ||
461 | .check_priv_security = vgpu_gm20b_fuse_check_priv_security, | ||
462 | }, | ||
459 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, | 463 | .chip_init_gpu_characteristics = vgpu_init_gpu_characteristics, |
460 | .get_litter_value = gm20b_get_litter_value, | 464 | .get_litter_value = gm20b_get_litter_value, |
461 | }; | 465 | }; |
@@ -463,7 +467,6 @@ static const struct gpu_ops vgpu_gm20b_ops = { | |||
463 | int vgpu_gm20b_init_hal(struct gk20a *g) | 467 | int vgpu_gm20b_init_hal(struct gk20a *g) |
464 | { | 468 | { |
465 | struct gpu_ops *gops = &g->ops; | 469 | struct gpu_ops *gops = &g->ops; |
466 | u32 val; | ||
467 | 470 | ||
468 | gops->ltc = vgpu_gm20b_ops.ltc; | 471 | gops->ltc = vgpu_gm20b_ops.ltc; |
469 | gops->ce2 = vgpu_gm20b_ops.ce2; | 472 | gops->ce2 = vgpu_gm20b_ops.ce2; |
@@ -499,26 +502,19 @@ int vgpu_gm20b_init_hal(struct gk20a *g) | |||
499 | 502 | ||
500 | gops->priv_ring = vgpu_gm20b_ops.priv_ring; | 503 | gops->priv_ring = vgpu_gm20b_ops.priv_ring; |
501 | 504 | ||
505 | gops->fuse = vgpu_gm20b_ops.fuse; | ||
506 | |||
502 | /* Lone functions */ | 507 | /* Lone functions */ |
503 | gops->chip_init_gpu_characteristics = | 508 | gops->chip_init_gpu_characteristics = |
504 | vgpu_gm20b_ops.chip_init_gpu_characteristics; | 509 | vgpu_gm20b_ops.chip_init_gpu_characteristics; |
505 | gops->get_litter_value = vgpu_gm20b_ops.get_litter_value; | 510 | gops->get_litter_value = vgpu_gm20b_ops.get_litter_value; |
506 | 511 | ||
507 | __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); | 512 | __nvgpu_set_enabled(g, NVGPU_GR_USE_DMA_FOR_FW_BOOTSTRAP, true); |
508 | __nvgpu_set_enabled(g, NVGPU_SEC_SECUREGPCCS, false); | ||
509 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); | 513 | __nvgpu_set_enabled(g, NVGPU_PMU_PSTATE, false); |
510 | 514 | ||
511 | if (nvgpu_is_enabled(g, NVGPU_IS_FMODEL)) { | 515 | /* Read fuses to check if gpu needs to boot in secure/non-secure mode */ |
512 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); | 516 | if (gops->fuse.check_priv_security(g)) |
513 | } else { | 517 | return -EINVAL; /* Do not boot gpu */ |
514 | val = gk20a_readl(g, fuse_opt_priv_sec_en_r()); | ||
515 | if (!val) { | ||
516 | gk20a_dbg_info("priv security is disabled in HW"); | ||
517 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, false); | ||
518 | } else { | ||
519 | __nvgpu_set_enabled(g, NVGPU_SEC_PRIVSECURITY, true); | ||
520 | } | ||
521 | } | ||
522 | 518 | ||
523 | /* priv security dependent ops */ | 519 | /* priv security dependent ops */ |
524 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { | 520 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { |