summaryrefslogtreecommitdiffstats
path: root/drivers/gpu/nvgpu
diff options
context:
space:
mode:
authorSeshendra Gadagottu <sgadagottu@nvidia.com>2014-06-16 23:28:45 -0400
committerDan Willemsen <dwillemsen@nvidia.com>2015-03-18 15:10:11 -0400
commitd8e7600ed884b5bacb042f66c9b1044f24da3997 (patch)
treecb10583ecd158035674d79c5d40b9c6225a8175c /drivers/gpu/nvgpu
parent6cd26db47779441078746390f14f78848cd047ab (diff)
gpu: nvgpu: support non-secure boot
For non-secure FALCON boot support, by-pass MMU check. Bug 1524197 Change-Id: I735c10a1ea50357c1ea2d5514c73477e76db7e77 Signed-off-by: Seshendra Gadagottu <sgadagottu@nvidia.com> Reviewed-on: http://git-master/r/424005 Reviewed-by: Automatic_Commit_Validation_User Reviewed-by: Supriya Sharatkumar <ssharatkumar@nvidia.com> Reviewed-by: Vijayakumar Subbu <vsubbu@nvidia.com> GVS: Gerrit_Virtual_Submit Reviewed-by: Terje Bergstrom <tbergstrom@nvidia.com>
Diffstat (limited to 'drivers/gpu/nvgpu')
-rw-r--r--drivers/gpu/nvgpu/gm20b/gr_gm20b.c4
-rw-r--r--drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h4
2 files changed, 8 insertions, 0 deletions
diff --git a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
index c5de8f60..2efb7228 100644
--- a/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
+++ b/drivers/gpu/nvgpu/gm20b/gr_gm20b.c
@@ -30,6 +30,10 @@ static void gr_gm20b_init_gpc_mmu(struct gk20a *g)
30 30
31 gk20a_dbg_info("initialize gpc mmu"); 31 gk20a_dbg_info("initialize gpc mmu");
32 32
33 /* Bypass MMU check for non-secure boot. For
34 * secure-boot,this register write has no-effect */
35 gk20a_writel(g, fb_priv_mmu_phy_secure_r(), 0xffffffff);
36
33 temp = gk20a_readl(g, fb_mmu_ctrl_r()); 37 temp = gk20a_readl(g, fb_mmu_ctrl_r());
34 temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() | 38 temp &= gr_gpcs_pri_mmu_ctrl_vm_pg_size_m() |
35 gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m() | 39 gr_gpcs_pri_mmu_ctrl_use_pdb_big_page_size_m() |
diff --git a/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h b/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
index f3ad6f26..39259516 100644
--- a/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
+++ b/drivers/gpu/nvgpu/gm20b/hw_fb_gm20b.h
@@ -58,6 +58,10 @@ static inline u32 fb_mmu_ctrl_r(void)
58{ 58{
59 return 0x00100c80; 59 return 0x00100c80;
60} 60}
61static inline u32 fb_priv_mmu_phy_secure_r(void)
62{
63 return 0x00100ce4;
64}
61static inline u32 fb_mmu_ctrl_vm_pg_size_f(u32 v) 65static inline u32 fb_mmu_ctrl_vm_pg_size_f(u32 v)
62{ 66{
63 return (v & 0x1) << 0; 67 return (v & 0x1) << 0;