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/pmu_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/pmu_gp10b.c')
-rw-r--r-- | drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | 39 |
1 files changed, 0 insertions, 39 deletions
diff --git a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c index 5c7d1523..d268ab88 100644 --- a/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c +++ b/drivers/gpu/nvgpu/gp10b/pmu_gp10b.c | |||
@@ -304,45 +304,6 @@ void gp10b_write_dmatrfbase(struct gk20a *g, u32 addr) | |||
304 | 0x0); | 304 | 0x0); |
305 | } | 305 | } |
306 | 306 | ||
307 | int gp10b_init_pmu_setup_hw1(struct gk20a *g) | ||
308 | { | ||
309 | struct nvgpu_pmu *pmu = &g->pmu; | ||
310 | int err; | ||
311 | |||
312 | nvgpu_log_fn(g, " "); | ||
313 | |||
314 | nvgpu_mutex_acquire(&pmu->isr_mutex); | ||
315 | nvgpu_flcn_reset(pmu->flcn); | ||
316 | pmu->isr_enabled = true; | ||
317 | nvgpu_mutex_release(&pmu->isr_mutex); | ||
318 | |||
319 | /* setup apertures - virtual */ | ||
320 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_UCODE), | ||
321 | pwr_fbif_transcfg_mem_type_virtual_f()); | ||
322 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_VIRT), | ||
323 | pwr_fbif_transcfg_mem_type_virtual_f()); | ||
324 | |||
325 | /* setup apertures - physical */ | ||
326 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_PHYS_VID), | ||
327 | pwr_fbif_transcfg_mem_type_physical_f() | | ||
328 | pwr_fbif_transcfg_target_local_fb_f()); | ||
329 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_PHYS_SYS_COH), | ||
330 | pwr_fbif_transcfg_mem_type_physical_f() | | ||
331 | pwr_fbif_transcfg_target_coherent_sysmem_f()); | ||
332 | gk20a_writel(g, pwr_fbif_transcfg_r(GK20A_PMU_DMAIDX_PHYS_SYS_NCOH), | ||
333 | pwr_fbif_transcfg_mem_type_physical_f() | | ||
334 | pwr_fbif_transcfg_target_noncoherent_sysmem_f()); | ||
335 | |||
336 | err = g->ops.pmu.pmu_nsbootstrap(pmu); | ||
337 | if (err) { | ||
338 | return err; | ||
339 | } | ||
340 | |||
341 | nvgpu_log_fn(g, "done"); | ||
342 | return 0; | ||
343 | |||
344 | } | ||
345 | |||
346 | bool gp10b_is_lazy_bootstrap(u32 falcon_id) | 307 | bool gp10b_is_lazy_bootstrap(u32 falcon_id) |
347 | { | 308 | { |
348 | bool enable_status = false; | 309 | bool enable_status = false; |