From 300f734f9f4b249d9c5da41fc6b3b3c0dbd4306f Mon Sep 17 00:00:00 2001 From: Vedashree Vidwans Date: Thu, 7 Mar 2019 13:05:48 -0800 Subject: [PATCH] gpu: nvgpu: unit: fix page_table_faults.init test Bug fix in nvgpu_aperture_mask_raw function hits BUG() due to invalid aperture type. This patch resolves the issue by initializing mem_wr_mem and mem_rd_mem aperture value to APERTURE_SYSMEM type. JIRA NVGPU-2933 Change-Id: Ib4879697781a1b8d73e9428299d489aa5228c9a0 Signed-off-by: Vedashree Vidwans Reviewed-on: https://git-master.nvidia.com/r/2035197 GVS: Gerrit_Virtual_Submit Reviewed-by: Alex Waterman Reviewed-by: Nicolas Benech Reviewed-by: mobile promotions Tested-by: mobile promotions --- userspace/units/mm/page_table_faults/page_table_faults.c | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/userspace/units/mm/page_table_faults/page_table_faults.c b/userspace/units/mm/page_table_faults/page_table_faults.c index a3cdf30df..c6c9367d2 100644 --- a/userspace/units/mm/page_table_faults/page_table_faults.c +++ b/userspace/units/mm/page_table_faults/page_table_faults.c @@ -190,6 +190,11 @@ static int init_mm(struct unit_module *m, struct gk20a *g) unit_return_fail(m, "'bar2' nvgpu_vm_init failed\n"); } + /* + * This initialization will make sure that correct aperture mask + * is returned */ + g->mm.mmu_wr_mem.aperture = APERTURE_SYSMEM; + g->mm.mmu_rd_mem.aperture = APERTURE_SYSMEM; /* Init MM H/W */ err = g->ops.mm.init_mm_setup_hw(g);