diff options
author | Mahantesh Kumbar <mkumbar@nvidia.com> | 2018-09-10 11:41:49 -0400 |
---|---|---|
committer | mobile promotions <svcmobile_promotions@nvidia.com> | 2018-09-24 11:12:03 -0400 |
commit | 863b47064445b3dd5cdc354821c8d3d14deade33 (patch) | |
tree | 1e53f26c1549d1970d752f74ab82a4d55642620b /drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |
parent | fdf77eda18b59c305d4dd8436d8b09d42ec4718a (diff) |
gpu: nvgpu: PMU init sequence change
-Moved PMU RTOS init & start RTOS from acr_gm20b.c file pmu.c
method nvgpu_init_pmu_support()
-Modified nvgpu_init_pmu_support() to init required interface
for PMU RTOS & does start PMU RTOS in secure & non-secure
based on NVGPU_SEC_PRIVSECURITY flag.
-Created secured_pmu_start ops under PMU ops to start PMU
falcon in low secure mode.
-Updated PMU ops update_lspmu_cmdline_args, setup_apertures &
secured_pmu_start assignment for gp106 & gv100 to support
modified PMU init sequence.
-Removed duplicate PMU non-secure bootstrap code from multiple
files & defined gm20b_ns_pmu_setup_hw_and_bootstrap()method
to handle non secure PMU bootstrap, reused this method
for need chips.
JIRA NVGPU-1146
Change-Id: I3957da2936b3c4ea0c985e67802c847c38de7c89
Signed-off-by: Mahantesh Kumbar <mkumbar@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1818099
Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com>
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu/gp10b/hal_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/hal_gp10b.c | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c index 759d271e..740cb8b7 100644 --- a/drivers/gpu/nvgpu/gp10b/hal_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/hal_gp10b.c | |||
@@ -794,7 +794,8 @@ int gp10b_init_hal(struct gk20a *g) | |||
794 | gm20b_flcn_populate_bl_dmem_desc, | 794 | gm20b_flcn_populate_bl_dmem_desc, |
795 | gops->pmu.update_lspmu_cmdline_args = | 795 | gops->pmu.update_lspmu_cmdline_args = |
796 | gm20b_update_lspmu_cmdline_args; | 796 | gm20b_update_lspmu_cmdline_args; |
797 | gops->pmu.setup_apertures = gm20b_setup_apertures; | 797 | gops->pmu.setup_apertures = gm20b_pmu_setup_apertures; |
798 | gops->pmu.secured_pmu_start = gm20b_secured_pmu_start; | ||
798 | 799 | ||
799 | gops->pmu.init_wpr_region = gm20b_pmu_init_acr; | 800 | gops->pmu.init_wpr_region = gm20b_pmu_init_acr; |
800 | gops->pmu.load_lsfalcon_ucode = gp10b_load_falcon_ucode; | 801 | gops->pmu.load_lsfalcon_ucode = gp10b_load_falcon_ucode; |
@@ -806,6 +807,8 @@ int gp10b_init_hal(struct gk20a *g) | |||
806 | /* Inherit from gk20a */ | 807 | /* Inherit from gk20a */ |
807 | gops->pmu.is_pmu_supported = gk20a_is_pmu_supported, | 808 | gops->pmu.is_pmu_supported = gk20a_is_pmu_supported, |
808 | gops->pmu.prepare_ucode = nvgpu_pmu_prepare_ns_ucode_blob, | 809 | gops->pmu.prepare_ucode = nvgpu_pmu_prepare_ns_ucode_blob, |
810 | gops->pmu.pmu_setup_hw_and_bootstrap = | ||
811 | gm20b_ns_pmu_setup_hw_and_bootstrap; | ||
809 | gops->pmu.pmu_nsbootstrap = pmu_bootstrap, | 812 | gops->pmu.pmu_nsbootstrap = pmu_bootstrap, |
810 | 813 | ||
811 | gops->pmu.load_lsfalcon_ucode = NULL; | 814 | gops->pmu.load_lsfalcon_ucode = NULL; |