From 23ff2eb5c9d498eddd36eb710d4058b23619a0c8 Mon Sep 17 00:00:00 2001 From: Mahantesh Kumbar Date: Thu, 3 Nov 2016 12:58:28 +0530 Subject: gpu: nvgpu: keep sec2 idle sec2 falcon reset after secure boot complete to keep sec2 idle issue: ELPG does not engage if PG engine is dependent on sec2 idleness JIRA DNVGPU-71 Change-Id: If264c610dae857ae9b9f9bc77c59f24f239ce1ce Signed-off-by: Mahantesh Kumbar Reviewed-on: http://git-master/r/1247290 (cherry-picked from commit de2337de1211e4167993982e50237fe1115053a1) Reviewed-on: http://git-master/r/1267260 Reviewed-by: Terje Bergstrom Tested-by: Terje Bergstrom Reviewed-by: Automatic_Commit_Validation_User --- drivers/gpu/nvgpu/gp106/acr_gp106.c | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) (limited to 'drivers/gpu/nvgpu') diff --git a/drivers/gpu/nvgpu/gp106/acr_gp106.c b/drivers/gpu/nvgpu/gp106/acr_gp106.c index b883ad83..5ed6300c 100644 --- a/drivers/gpu/nvgpu/gp106/acr_gp106.c +++ b/drivers/gpu/nvgpu/gp106/acr_gp106.c @@ -22,7 +22,8 @@ #include "gk20a/gk20a.h" #include "gk20a/pmu_gk20a.h" #include "gk20a/semaphore_gk20a.h" -#include "gm20b/hw_pwr_gm20b.h" +#include "gp106/hw_psec_gp106.h" +#include "gp106/hw_pwr_gp106.h" #include "gm206/acr_gm206.h" #include "gm20b/acr_gm20b.h" #include "gm206/pmu_gm206.h" @@ -1150,6 +1151,14 @@ static int gp106_bootstrap_hs_flcn(struct gk20a *g) err = status; goto err_free_ucode_map; } + + /* sec2 reset - to keep it idle */ + gk20a_writel(g, psec_falcon_engine_r(), + pwr_falcon_engine_reset_true_f()); + udelay(10); + gk20a_writel(g, psec_falcon_engine_r(), + pwr_falcon_engine_reset_false_f()); + return 0; err_free_ucode_map: gk20a_gmmu_unmap_free(vm, &acr->acr_ucode); -- cgit v1.2.2