diff options
author | Sunny He <suhe@nvidia.com> | 2017-08-01 20:10:42 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2017-08-21 16:06:07 -0400 |
commit | 5f010177de985c901c33c914efe70a8498a5974f (patch) | |
tree | 1b1a2ac1ab71608a0754a7eb64222f5d198e793c /drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |
parent | b50b379c192714d0d08c3f2d33e90c95cf795253 (diff) |
gpu: nvgpu: Reorg pmu HAL initialization
Reorganize HAL initialization to remove inheritance and construct
the gpu_ops struct at compile time. This patch only covers the
pmu sub-module of the gpu_ops struct.
Perform HAL function assignments in hal_gxxxx.c through the
population of a chip-specific copy of gpu_ops.
Jira NVGPU-74
Change-Id: I8839ac99e87153637005e23b3013237f57275c54
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1530982
Reviewed-by: svccoveritychecker <svccoveritychecker@nvidia.com>
Reviewed-by: svc-mobile-coverity <svc-mobile-coverity@nvidia.com>
Reviewed-by: Automatic_Commit_Validation_User
GVS: Gerrit_Virtual_Submit
Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/hal_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 63 |
1 files changed, 62 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index a37295bb..40ef35d5 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -26,6 +26,7 @@ | |||
26 | #include "gk20a/regops_gk20a.h" | 26 | #include "gk20a/regops_gk20a.h" |
27 | #include "gk20a/mc_gk20a.h" | 27 | #include "gk20a/mc_gk20a.h" |
28 | #include "gk20a/fb_gk20a.h" | 28 | #include "gk20a/fb_gk20a.h" |
29 | #include "gk20a/pmu_gk20a.h" | ||
29 | 30 | ||
30 | #include "gp10b/gr_gp10b.h" | 31 | #include "gp10b/gr_gp10b.h" |
31 | #include "gp10b/fecs_trace_gp10b.h" | 32 | #include "gp10b/fecs_trace_gp10b.h" |
@@ -46,6 +47,7 @@ | |||
46 | #include "gm20b/ltc_gm20b.h" | 47 | #include "gm20b/ltc_gm20b.h" |
47 | #include "gm20b/gr_gm20b.h" | 48 | #include "gm20b/gr_gm20b.h" |
48 | #include "gm20b/fifo_gm20b.h" | 49 | #include "gm20b/fifo_gm20b.h" |
50 | #include "gm20b/acr_gm20b.h" | ||
49 | #include "gm20b/pmu_gm20b.h" | 51 | #include "gm20b/pmu_gm20b.h" |
50 | #include "gm20b/clk_gm20b.h" | 52 | #include "gm20b/clk_gm20b.h" |
51 | #include "gm20b/fb_gm20b.h" | 53 | #include "gm20b/fb_gm20b.h" |
@@ -65,6 +67,7 @@ | |||
65 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> | 67 | #include <nvgpu/hw/gp10b/hw_ram_gp10b.h> |
66 | #include <nvgpu/hw/gp10b/hw_top_gp10b.h> | 68 | #include <nvgpu/hw/gp10b/hw_top_gp10b.h> |
67 | #include <nvgpu/hw/gp10b/hw_pram_gp10b.h> | 69 | #include <nvgpu/hw/gp10b/hw_pram_gp10b.h> |
70 | #include <nvgpu/hw/gp10b/hw_pwr_gp10b.h> | ||
68 | 71 | ||
69 | static int gp10b_get_litter_value(struct gk20a *g, int value) | 72 | static int gp10b_get_litter_value(struct gk20a *g, int value) |
70 | { | 73 | { |
@@ -353,6 +356,27 @@ static const struct gpu_ops gp10b_ops = { | |||
353 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, | 356 | .init_therm_setup_hw = gp10b_init_therm_setup_hw, |
354 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, | 357 | .elcg_init_idle_filters = gp10b_elcg_init_idle_filters, |
355 | }, | 358 | }, |
359 | .pmu = { | ||
360 | .pmu_setup_elpg = gp10b_pmu_setup_elpg, | ||
361 | .pmu_get_queue_head = pwr_pmu_queue_head_r, | ||
362 | .pmu_get_queue_head_size = pwr_pmu_queue_head__size_1_v, | ||
363 | .pmu_get_queue_tail = pwr_pmu_queue_tail_r, | ||
364 | .pmu_get_queue_tail_size = pwr_pmu_queue_tail__size_1_v, | ||
365 | .pmu_queue_head = gk20a_pmu_queue_head, | ||
366 | .pmu_queue_tail = gk20a_pmu_queue_tail, | ||
367 | .pmu_msgq_tail = gk20a_pmu_msgq_tail, | ||
368 | .pmu_mutex_size = pwr_pmu_mutex__size_1_v, | ||
369 | .pmu_mutex_acquire = gk20a_pmu_mutex_acquire, | ||
370 | .pmu_mutex_release = gk20a_pmu_mutex_release, | ||
371 | .write_dmatrfbase = gp10b_write_dmatrfbase, | ||
372 | .pmu_elpg_statistics = gp10b_pmu_elpg_statistics, | ||
373 | .pmu_pg_init_param = gp10b_pg_gr_init, | ||
374 | .pmu_pg_supported_engines_list = gk20a_pmu_pg_engines_list, | ||
375 | .pmu_pg_engines_feature_list = gk20a_pmu_pg_feature_list, | ||
376 | .dump_secure_fuses = pmu_dump_security_fuses_gp10b, | ||
377 | .reset_engine = gk20a_pmu_engine_reset, | ||
378 | .is_engine_in_reset = gk20a_pmu_is_engine_in_reset, | ||
379 | }, | ||
356 | .regops = { | 380 | .regops = { |
357 | .get_global_whitelist_ranges = | 381 | .get_global_whitelist_ranges = |
358 | gp10b_get_global_whitelist_ranges, | 382 | gp10b_get_global_whitelist_ranges, |
@@ -455,6 +479,7 @@ int gp10b_init_hal(struct gk20a *g) | |||
455 | gops->mm = gp10b_ops.mm; | 479 | gops->mm = gp10b_ops.mm; |
456 | gops->pramin = gp10b_ops.pramin; | 480 | gops->pramin = gp10b_ops.pramin; |
457 | gops->therm = gp10b_ops.therm; | 481 | gops->therm = gp10b_ops.therm; |
482 | gops->pmu = gp10b_ops.pmu; | ||
458 | gops->regops = gp10b_ops.regops; | 483 | gops->regops = gp10b_ops.regops; |
459 | gops->mc = gp10b_ops.mc; | 484 | gops->mc = gp10b_ops.mc; |
460 | gops->debug = gp10b_ops.debug; | 485 | gops->debug = gp10b_ops.debug; |
@@ -513,9 +538,45 @@ int gp10b_init_hal(struct gk20a *g) | |||
513 | } | 538 | } |
514 | #endif | 539 | #endif |
515 | 540 | ||
541 | /* priv security dependent ops */ | ||
542 | if (nvgpu_is_enabled(g, NVGPU_SEC_PRIVSECURITY)) { | ||
543 | /* Add in ops from gm20b acr */ | ||
544 | gops->pmu.is_pmu_supported = gm20b_is_pmu_supported, | ||
545 | gops->pmu.prepare_ucode = prepare_ucode_blob, | ||
546 | gops->pmu.pmu_setup_hw_and_bootstrap = gm20b_bootstrap_hs_flcn, | ||
547 | gops->pmu.is_lazy_bootstrap = gm20b_is_lazy_bootstrap, | ||
548 | gops->pmu.is_priv_load = gm20b_is_priv_load, | ||
549 | gops->pmu.get_wpr = gm20b_wpr_info, | ||
550 | gops->pmu.alloc_blob_space = gm20b_alloc_blob_space, | ||
551 | gops->pmu.pmu_populate_loader_cfg = | ||
552 | gm20b_pmu_populate_loader_cfg, | ||
553 | gops->pmu.flcn_populate_bl_dmem_desc = | ||
554 | gm20b_flcn_populate_bl_dmem_desc, | ||
555 | gops->pmu.falcon_wait_for_halt = pmu_wait_for_halt, | ||
556 | gops->pmu.falcon_clear_halt_interrupt_status = | ||
557 | clear_halt_interrupt_status, | ||
558 | gops->pmu.init_falcon_setup_hw = gm20b_init_pmu_setup_hw1, | ||
559 | |||
560 | gops->pmu.init_wpr_region = gm20b_pmu_init_acr; | ||
561 | gops->pmu.load_lsfalcon_ucode = gp10b_load_falcon_ucode; | ||
562 | gops->pmu.is_lazy_bootstrap = gp10b_is_lazy_bootstrap; | ||
563 | gops->pmu.is_priv_load = gp10b_is_priv_load; | ||
564 | } else { | ||
565 | /* Inherit from gk20a */ | ||
566 | gops->pmu.is_pmu_supported = gk20a_is_pmu_supported, | ||
567 | gops->pmu.prepare_ucode = nvgpu_pmu_prepare_ns_ucode_blob, | ||
568 | gops->pmu.pmu_setup_hw_and_bootstrap = gk20a_init_pmu_setup_hw1, | ||
569 | gops->pmu.pmu_nsbootstrap = pmu_bootstrap, | ||
570 | |||
571 | gops->pmu.load_lsfalcon_ucode = NULL; | ||
572 | gops->pmu.init_wpr_region = NULL; | ||
573 | gops->pmu.pmu_setup_hw_and_bootstrap = gp10b_init_pmu_setup_hw1; | ||
574 | } | ||
575 | |||
576 | __nvgpu_set_enabled(g, NVGPU_PMU_FECS_BOOTSTRAP_DONE, false); | ||
577 | g->pmu_lsf_pmu_wpr_init_done = 0; | ||
516 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; | 578 | g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; |
517 | gp10b_init_gr(g); | 579 | gp10b_init_gr(g); |
518 | gp10b_init_pmu_ops(g); | ||
519 | 580 | ||
520 | gp10b_init_uncompressed_kind_map(); | 581 | gp10b_init_uncompressed_kind_map(); |
521 | gp10b_init_kind_attr(); | 582 | gp10b_init_kind_attr(); |