nv-tegra-mirror/linux-nvgpu
1
0
Fork 0
mirror of git://nv-tegra.nvidia.com/linux-nvgpu.git synced 2025-12-23 09:57:08 +03:00
Code Issues Packages Projects Releases Wiki Activity

Revert "gpu: nvgpu: Reorg mm HAL initialization"

Browse Source 
Conflicts with gv100 changes

This reverts commit 8d63cd3995.

Change-Id: Ie2f88d281b2b87a9a794d79164a61c4d883626b7
Signed-off-by: Sunny He <suhe@nvidia.com>
Reviewed-on: https://git-master.nvidia.com/r/1537668
Reviewed-by: Shu Zhong <shuz@nvidia.com>
Tested-by: Shu Zhong <shuz@nvidia.com>
This commit is contained in:
Sunny He
2017-08-11 14:41:33 -07:00
committed by Shu Zhong
parent 8d63cd3995
commit f8399cfa55
12 changed files with 88 additions and 142 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
drivers/gpu/nvgpu/common/linux/platform_gk20a_tegra.c
View File

@@ -662,7 +662,7 @@ void gk20a_tegra_idle(struct device *dev)
void gk20a_tegra_init_secure_alloc(struct gk20a *g) void gk20a_tegra_init_secure_alloc(struct gk20a *g)
{ {
g->ops.secure_alloc = gk20a_tegra_secure_alloc; g->ops.mm.secure_alloc = gk20a_tegra_secure_alloc;
} }
#ifdef CONFIG_COMMON_CLK #ifdef CONFIG_COMMON_CLK

17
drivers/gpu/nvgpu/gk20a/gk20a.h
View File

@@ -734,17 +734,16 @@ struct gpu_ops {
void (*init_inst_block)(struct nvgpu_mem *inst_block, void (*init_inst_block)(struct nvgpu_mem *inst_block,
struct vm_gk20a *vm, u32 big_page_size); struct vm_gk20a *vm, u32 big_page_size);
bool (*mmu_fault_pending)(struct gk20a *g); bool (*mmu_fault_pending)(struct gk20a *g);
/* This function is called to allocate secure memory (memory
* that the CPU cannot see). The function should fill the
* context buffer descriptor (especially fields destroy, sgt,
* size).
*/
int (*secure_alloc)(struct gk20a *g,
struct gr_ctx_buffer_desc *desc,
size_t size);
void (*fault_info_mem_destroy)(struct gk20a *g); void (*fault_info_mem_destroy)(struct gk20a *g);
} mm; } mm;
/*
* This function is called to allocate secure memory (memory
* that the CPU cannot see). The function should fill the
* context buffer descriptor (especially fields destroy, sgt,
* size).
*/
int (*secure_alloc)(struct gk20a *g,
struct gr_ctx_buffer_desc *desc,
size_t size);
struct { struct {
u32 (*enter)(struct gk20a *g, struct nvgpu_mem *mem, u32 (*enter)(struct gk20a *g, struct nvgpu_mem *mem,
struct page_alloc_chunk *chunk, u32 w); struct page_alloc_chunk *chunk, u32 w);

12
drivers/gpu/nvgpu/gk20a/gr_gk20a.c
View File

@@ -2524,8 +2524,8 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
if (err) if (err)
goto clean_up; goto clean_up;
if (g->ops.secure_alloc) if (g->ops.mm.secure_alloc)
g->ops.secure_alloc(g, g->ops.mm.secure_alloc(g,
&gr->global_ctx_buffer[CIRCULAR_VPR], &gr->global_ctx_buffer[CIRCULAR_VPR],
cb_buffer_size); cb_buffer_size);
@@ -2536,8 +2536,8 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
if (err) if (err)
goto clean_up; goto clean_up;
if (g->ops.secure_alloc) if (g->ops.mm.secure_alloc)
g->ops.secure_alloc(g, g->ops.mm.secure_alloc(g,
&gr->global_ctx_buffer[PAGEPOOL_VPR], &gr->global_ctx_buffer[PAGEPOOL_VPR],
pagepool_buffer_size); pagepool_buffer_size);
@@ -2548,8 +2548,8 @@ static int gr_gk20a_alloc_global_ctx_buffers(struct gk20a *g)
if (err) if (err)
goto clean_up; goto clean_up;
if (g->ops.secure_alloc) if (g->ops.mm.secure_alloc)
g->ops.secure_alloc(g, g->ops.mm.secure_alloc(g,
&gr->global_ctx_buffer[ATTRIBUTE_VPR], &gr->global_ctx_buffer[ATTRIBUTE_VPR],
attr_buffer_size); attr_buffer_size);

26
drivers/gpu/nvgpu/gm20b/hal_gm20b.c
View File

@@ -19,7 +19,6 @@
#include "gk20a/fb_gk20a.h" #include "gk20a/fb_gk20a.h"
#include "gk20a/fifo_gk20a.h" #include "gk20a/fifo_gk20a.h"
#include "gk20a/therm_gk20a.h" #include "gk20a/therm_gk20a.h"
#include "gk20a/mm_gk20a.h"
#include "gk20a/css_gr_gk20a.h" #include "gk20a/css_gr_gk20a.h"
#include "gk20a/mc_gk20a.h" #include "gk20a/mc_gk20a.h"
#include "gk20a/bus_gk20a.h" #include "gk20a/bus_gk20a.h"
@@ -43,8 +42,6 @@
#include "bus_gm20b.h" #include "bus_gm20b.h"
#include "hal_gm20b.h" #include "hal_gm20b.h"
#include "common/linux/platform_gk20a_tegra.h"
#include <nvgpu/debug.h> #include <nvgpu/debug.h>
#include <nvgpu/bug.h> #include <nvgpu/bug.h>
#include <nvgpu/enabled.h> #include <nvgpu/enabled.h>
@@ -290,27 +287,6 @@ static const struct gpu_ops gm20b_ops = {
.get_netlist_name = gr_gm20b_get_netlist_name, .get_netlist_name = gr_gm20b_get_netlist_name,
.is_fw_defined = gr_gm20b_is_firmware_defined, .is_fw_defined = gr_gm20b_is_firmware_defined,
}, },
.mm = {
.support_sparse = gm20b_mm_support_sparse,
.gmmu_map = gk20a_locked_gmmu_map,
.gmmu_unmap = gk20a_locked_gmmu_unmap,
.vm_bind_channel = gk20a_vm_bind_channel,
.fb_flush = gk20a_mm_fb_flush,
.l2_invalidate = gk20a_mm_l2_invalidate,
.l2_flush = gk20a_mm_l2_flush,
.cbc_clean = gk20a_mm_cbc_clean,
.set_big_page_size = gm20b_mm_set_big_page_size,
.get_big_page_sizes = gm20b_mm_get_big_page_sizes,
.get_default_big_page_size = gm20b_mm_get_default_big_page_size,
.gpu_phys_addr = gm20b_gpu_phys_addr,
.get_physical_addr_bits = gk20a_mm_get_physical_addr_bits,
.get_mmu_levels = gk20a_mm_get_mmu_levels,
.init_pdb = gk20a_mm_init_pdb,
.init_mm_setup_hw = gk20a_init_mm_setup_hw,
.is_bar1_supported = gm20b_mm_is_bar1_supported,
.init_inst_block = gk20a_init_inst_block,
.mmu_fault_pending = gk20a_fifo_mmu_fault_pending,
},
.therm = { .therm = {
.init_therm_setup_hw = gm20b_init_therm_setup_hw, .init_therm_setup_hw = gm20b_init_therm_setup_hw,
.elcg_init_idle_filters = gk20a_elcg_init_idle_filters, .elcg_init_idle_filters = gk20a_elcg_init_idle_filters,
@@ -422,7 +398,6 @@ int gm20b_init_hal(struct gk20a *g)
gops->clock_gating = gm20b_ops.clock_gating; gops->clock_gating = gm20b_ops.clock_gating;
gops->fifo = gm20b_ops.fifo; gops->fifo = gm20b_ops.fifo;
gops->gr_ctx = gm20b_ops.gr_ctx; gops->gr_ctx = gm20b_ops.gr_ctx;
gops->mm = gm20b_ops.mm;
gops->therm = gm20b_ops.therm; gops->therm = gm20b_ops.therm;
/* /*
* clk must be assigned member by member * clk must be assigned member by member
@@ -487,6 +462,7 @@ int gm20b_init_hal(struct gk20a *g)
#endif #endif
g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
gm20b_init_gr(g); gm20b_init_gr(g);
gm20b_init_mm(gops);
gm20b_init_pmu_ops(g); gm20b_init_pmu_ops(g);
gm20b_init_uncompressed_kind_map(); gm20b_init_uncompressed_kind_map();

33
drivers/gpu/nvgpu/gm20b/mm_gm20b.c
View File

@@ -20,7 +20,7 @@
#include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h> #include <nvgpu/hw/gm20b/hw_gmmu_gm20b.h>
#include <nvgpu/hw/gm20b/hw_ram_gm20b.h> #include <nvgpu/hw/gm20b/hw_ram_gm20b.h>
void gm20b_mm_set_big_page_size(struct gk20a *g, static void gm20b_mm_set_big_page_size(struct gk20a *g,
struct nvgpu_mem *mem, int size) struct nvgpu_mem *mem, int size)
{ {
u32 val; u32 val;
@@ -40,22 +40,22 @@ void gm20b_mm_set_big_page_size(struct gk20a *g,
gk20a_dbg_fn("done"); gk20a_dbg_fn("done");
} }
u32 gm20b_mm_get_big_page_sizes(void) static u32 gm20b_mm_get_big_page_sizes(void)
{ {
return SZ_64K | SZ_128K; return SZ_64K | SZ_128K;
} }
u32 gm20b_mm_get_default_big_page_size(void) static u32 gm20b_mm_get_default_big_page_size(void)
{ {
return SZ_128K; return SZ_128K;
} }
bool gm20b_mm_support_sparse(struct gk20a *g) static bool gm20b_mm_support_sparse(struct gk20a *g)
{ {
return true; return true;
} }
bool gm20b_mm_is_bar1_supported(struct gk20a *g) static bool gm20b_mm_is_bar1_supported(struct gk20a *g)
{ {
return true; return true;
} }
@@ -65,3 +65,26 @@ u64 gm20b_gpu_phys_addr(struct gk20a *g,
{ {
return phys; return phys;
} }
void gm20b_init_mm(struct gpu_ops *gops)
{
gops->mm.support_sparse = gm20b_mm_support_sparse;
gops->mm.gmmu_map = gk20a_locked_gmmu_map;
gops->mm.gmmu_unmap = gk20a_locked_gmmu_unmap;
gops->mm.vm_bind_channel = gk20a_vm_bind_channel;
gops->mm.fb_flush = gk20a_mm_fb_flush;
gops->mm.l2_invalidate = gk20a_mm_l2_invalidate;
gops->mm.l2_flush = gk20a_mm_l2_flush;
gops->mm.cbc_clean = gk20a_mm_cbc_clean;
gops->mm.set_big_page_size = gm20b_mm_set_big_page_size;
gops->mm.get_big_page_sizes = gm20b_mm_get_big_page_sizes;
gops->mm.get_default_big_page_size = gm20b_mm_get_default_big_page_size;
gops->mm.gpu_phys_addr = gm20b_gpu_phys_addr;
gops->mm.get_physical_addr_bits = gk20a_mm_get_physical_addr_bits;
gops->mm.get_mmu_levels = gk20a_mm_get_mmu_levels;
gops->mm.init_pdb = gk20a_mm_init_pdb;
gops->mm.init_mm_setup_hw = gk20a_init_mm_setup_hw;
gops->mm.is_bar1_supported = gm20b_mm_is_bar1_supported;
gops->mm.init_inst_block = gk20a_init_inst_block;
gops->mm.mmu_fault_pending = gk20a_fifo_mmu_fault_pending;
}

12
drivers/gpu/nvgpu/gm20b/mm_gm20b.h
View File

@@ -1,7 +1,7 @@
/* /*
* GM20B GMMU * GM20B GMMU
* *
* Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -20,13 +20,9 @@ struct gk20a;
#define PDE_ADDR_START(x, y) ((x) & ~((0x1UL << (y)) - 1)) #define PDE_ADDR_START(x, y) ((x) & ~((0x1UL << (y)) - 1))
#define PDE_ADDR_END(x, y) ((x) | ((0x1UL << (y)) - 1)) #define PDE_ADDR_END(x, y) ((x) | ((0x1UL << (y)) - 1))
void gm20b_mm_set_big_page_size(struct gk20a *g,
struct nvgpu_mem *mem, int size);
u32 gm20b_mm_get_big_page_sizes(void);
u32 gm20b_mm_get_default_big_page_size(void);
bool gm20b_mm_support_sparse(struct gk20a *g);
bool gm20b_mm_is_bar1_supported(struct gk20a *g);
int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g);
u64 gm20b_gpu_phys_addr(struct gk20a *g, u64 gm20b_gpu_phys_addr(struct gk20a *g,
struct nvgpu_gmmu_attrs *attrs, u64 phys); struct nvgpu_gmmu_attrs *attrs, u64 phys);
void gm20b_init_mm(struct gpu_ops *gops);
int gm20b_mm_mmu_vpr_info_fetch(struct gk20a *g);
#endif #endif

31
drivers/gpu/nvgpu/gp106/hal_gp106.c
View File

@@ -17,7 +17,6 @@
#include "gk20a/fifo_gk20a.h" #include "gk20a/fifo_gk20a.h"
#include "gk20a/ctxsw_trace_gk20a.h" #include "gk20a/ctxsw_trace_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h" #include "gk20a/fecs_trace_gk20a.h"
#include "gk20a/mm_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/css_gr_gk20a.h" #include "gk20a/css_gr_gk20a.h"
#include "gk20a/bus_gk20a.h" #include "gk20a/bus_gk20a.h"
@@ -45,7 +44,6 @@
#include "gm20b/ltc_gm20b.h" #include "gm20b/ltc_gm20b.h"
#include "gm20b/gr_gm20b.h" #include "gm20b/gr_gm20b.h"
#include "gm20b/fifo_gm20b.h" #include "gm20b/fifo_gm20b.h"
#include "gm20b/mm_gm20b.h"
#include "gm20b/pmu_gm20b.h" #include "gm20b/pmu_gm20b.h"
#include "gm20b/fb_gm20b.h" #include "gm20b/fb_gm20b.h"
@@ -67,8 +65,6 @@
#include "hal_gp106.h" #include "hal_gp106.h"
#include "common/linux/platform_gk20a_tegra.h"
#include <nvgpu/debug.h> #include <nvgpu/debug.h>
#include <nvgpu/bug.h> #include <nvgpu/bug.h>
#include <nvgpu/bus.h> #include <nvgpu/bus.h>
@@ -360,31 +356,6 @@ static const struct gpu_ops gp106_ops = {
.max_entries = gk20a_gr_max_entries, .max_entries = gk20a_gr_max_entries,
}, },
#endif /* CONFIG_GK20A_CTXSW_TRACE */ #endif /* CONFIG_GK20A_CTXSW_TRACE */
.mm = {
.support_sparse = gm20b_mm_support_sparse,
.gmmu_map = gk20a_locked_gmmu_map,
.gmmu_unmap = gk20a_locked_gmmu_unmap,
.vm_bind_channel = gk20a_vm_bind_channel,
.fb_flush = gk20a_mm_fb_flush,
.l2_invalidate = gk20a_mm_l2_invalidate,
.l2_flush = gk20a_mm_l2_flush,
.cbc_clean = gk20a_mm_cbc_clean,
.set_big_page_size = gm20b_mm_set_big_page_size,
.get_big_page_sizes = gm20b_mm_get_big_page_sizes,
.get_default_big_page_size = gp10b_mm_get_default_big_page_size,
.gpu_phys_addr = gm20b_gpu_phys_addr,
.get_physical_addr_bits = NULL,
.get_mmu_levels = gp10b_mm_get_mmu_levels,
.init_pdb = gp10b_mm_init_pdb,
.init_mm_setup_hw = gp10b_init_mm_setup_hw,
.is_bar1_supported = gm20b_mm_is_bar1_supported,
.init_inst_block = gk20a_init_inst_block,
.mmu_fault_pending = gk20a_fifo_mmu_fault_pending,
.init_bar2_vm = gb10b_init_bar2_vm,
.init_bar2_mm_hw_setup = gb10b_init_bar2_mm_hw_setup,
.remove_bar2_vm = gp10b_remove_bar2_vm,
.get_vidmem_size = gp106_mm_get_vidmem_size,
},
.pramin = { .pramin = {
.enter = gk20a_pramin_enter, .enter = gk20a_pramin_enter,
.exit = gk20a_pramin_exit, .exit = gk20a_pramin_exit,
@@ -531,7 +502,6 @@ int gp106_init_hal(struct gk20a *g)
gops->fifo = gp106_ops.fifo; gops->fifo = gp106_ops.fifo;
gops->gr_ctx = gp106_ops.gr_ctx; gops->gr_ctx = gp106_ops.gr_ctx;
gops->fecs_trace = gp106_ops.fecs_trace; gops->fecs_trace = gp106_ops.fecs_trace;
gops->mm = gp106_ops.mm;
gops->pramin = gp106_ops.pramin; gops->pramin = gp106_ops.pramin;
gops->therm = gp106_ops.therm; gops->therm = gp106_ops.therm;
/* /*
@@ -573,6 +543,7 @@ int gp106_init_hal(struct gk20a *g)
g->bootstrap_owner = LSF_FALCON_ID_SEC2; g->bootstrap_owner = LSF_FALCON_ID_SEC2;
gp106_init_gr(g); gp106_init_gr(g);
gp106_init_mm(gops);
gp106_init_pmu_ops(g); gp106_init_pmu_ops(g);
gp10b_init_uncompressed_kind_map(); gp10b_init_uncompressed_kind_map();

11
drivers/gpu/nvgpu/gp106/mm_gp106.c
View File

@@ -1,7 +1,7 @@
/* /*
* GP106 memory management * GP106 memory management
* *
* Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -19,7 +19,7 @@
#include <nvgpu/hw/gp106/hw_fb_gp106.h> #include <nvgpu/hw/gp106/hw_fb_gp106.h>
size_t gp106_mm_get_vidmem_size(struct gk20a *g) static size_t gp106_mm_get_vidmem_size(struct gk20a *g)
{ {
u32 range = gk20a_readl(g, fb_mmu_local_memory_range_r()); u32 range = gk20a_readl(g, fb_mmu_local_memory_range_r());
u32 mag = fb_mmu_local_memory_range_lower_mag_v(range); u32 mag = fb_mmu_local_memory_range_lower_mag_v(range);
@@ -32,3 +32,10 @@ size_t gp106_mm_get_vidmem_size(struct gk20a *g)
return bytes; return bytes;
} }
void gp106_init_mm(struct gpu_ops *gops)
{
gp10b_init_mm(gops);
gops->mm.get_vidmem_size = gp106_mm_get_vidmem_size;
gops->mm.get_physical_addr_bits = NULL;
}

6
drivers/gpu/nvgpu/gp106/mm_gp106.h
View File

@@ -1,7 +1,7 @@
/* /*
* GP106 memory management * GP106 memory management
* *
* Copyright (c) 2016-2017, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2016, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -16,8 +16,8 @@
#ifndef MM_GP106_H #ifndef MM_GP106_H
#define MM_GP106_H #define MM_GP106_H
struct gk20a; struct gpu_ops;
size_t gp106_mm_get_vidmem_size(struct gk20a *g); void gp106_init_mm(struct gpu_ops *gops);
#endif #endif

31
drivers/gpu/nvgpu/gp10b/hal_gp10b.c
View File

@@ -17,7 +17,6 @@
#include "gk20a/fifo_gk20a.h" #include "gk20a/fifo_gk20a.h"
#include "gk20a/ctxsw_trace_gk20a.h" #include "gk20a/ctxsw_trace_gk20a.h"
#include "gk20a/fecs_trace_gk20a.h" #include "gk20a/fecs_trace_gk20a.h"
#include "gk20a/mm_gk20a.h"
#include "gk20a/dbg_gpu_gk20a.h" #include "gk20a/dbg_gpu_gk20a.h"
#include "gk20a/css_gr_gk20a.h" #include "gk20a/css_gr_gk20a.h"
#include "gk20a/bus_gk20a.h" #include "gk20a/bus_gk20a.h"
@@ -48,14 +47,12 @@
#include "gm20b/fifo_gm20b.h" #include "gm20b/fifo_gm20b.h"
#include "gm20b/pmu_gm20b.h" #include "gm20b/pmu_gm20b.h"
#include "gm20b/clk_gm20b.h" #include "gm20b/clk_gm20b.h"
#include "gm20b/fifo_gm20b.h"
#include "gm20b/fb_gm20b.h" #include "gm20b/fb_gm20b.h"
#include "gm20b/mm_gm20b.h"
#include "gp10b.h" #include "gp10b.h"
#include "hal_gp10b.h" #include "hal_gp10b.h"
#include "common/linux/platform_gk20a_tegra.h"
#include <nvgpu/debug.h> #include <nvgpu/debug.h>
#include <nvgpu/bug.h> #include <nvgpu/bug.h>
#include <nvgpu/enabled.h> #include <nvgpu/enabled.h>
@@ -322,30 +319,6 @@ static const struct gpu_ops gp10b_ops = {
.max_entries = gk20a_gr_max_entries, .max_entries = gk20a_gr_max_entries,
}, },
#endif /* CONFIG_GK20A_CTXSW_TRACE */ #endif /* CONFIG_GK20A_CTXSW_TRACE */
.mm = {
.support_sparse = gm20b_mm_support_sparse,
.gmmu_map = gk20a_locked_gmmu_map,
.gmmu_unmap = gk20a_locked_gmmu_unmap,
.vm_bind_channel = gk20a_vm_bind_channel,
.fb_flush = gk20a_mm_fb_flush,
.l2_invalidate = gk20a_mm_l2_invalidate,
.l2_flush = gk20a_mm_l2_flush,
.cbc_clean = gk20a_mm_cbc_clean,
.set_big_page_size = gm20b_mm_set_big_page_size,
.get_big_page_sizes = gm20b_mm_get_big_page_sizes,
.get_default_big_page_size = gp10b_mm_get_default_big_page_size,
.gpu_phys_addr = gm20b_gpu_phys_addr,
.get_physical_addr_bits = gp10b_mm_get_physical_addr_bits,
.get_mmu_levels = gp10b_mm_get_mmu_levels,
.init_pdb = gp10b_mm_init_pdb,
.init_mm_setup_hw = gp10b_init_mm_setup_hw,
.is_bar1_supported = gm20b_mm_is_bar1_supported,
.init_inst_block = gk20a_init_inst_block,
.mmu_fault_pending = gk20a_fifo_mmu_fault_pending,
.init_bar2_vm = gb10b_init_bar2_vm,
.init_bar2_mm_hw_setup = gb10b_init_bar2_mm_hw_setup,
.remove_bar2_vm = gp10b_remove_bar2_vm,
},
.pramin = { .pramin = {
.enter = gk20a_pramin_enter, .enter = gk20a_pramin_enter,
.exit = gk20a_pramin_exit, .exit = gk20a_pramin_exit,
@@ -454,7 +427,6 @@ int gp10b_init_hal(struct gk20a *g)
gops->fifo = gp10b_ops.fifo; gops->fifo = gp10b_ops.fifo;
gops->gr_ctx = gp10b_ops.gr_ctx; gops->gr_ctx = gp10b_ops.gr_ctx;
gops->fecs_trace = gp10b_ops.fecs_trace; gops->fecs_trace = gp10b_ops.fecs_trace;
gops->mm = gp10b_ops.mm;
gops->pramin = gp10b_ops.pramin; gops->pramin = gp10b_ops.pramin;
gops->therm = gp10b_ops.therm; gops->therm = gp10b_ops.therm;
gops->regops = gp10b_ops.regops; gops->regops = gp10b_ops.regops;
@@ -517,6 +489,7 @@ int gp10b_init_hal(struct gk20a *g)
g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT; g->bootstrap_owner = LSF_BOOTSTRAP_OWNER_DEFAULT;
gp10b_init_gr(g); gp10b_init_gr(g);
gp10b_init_mm(gops);
gp10b_init_pmu_ops(g); gp10b_init_pmu_ops(g);
gp10b_init_uncompressed_kind_map(); gp10b_init_uncompressed_kind_map();

30
drivers/gpu/nvgpu/gp10b/mm_gp10b.c
View File

@@ -27,17 +27,17 @@
#include <nvgpu/hw/gp10b/hw_bus_gp10b.h> #include <nvgpu/hw/gp10b/hw_bus_gp10b.h>
#include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h> #include <nvgpu/hw/gp10b/hw_gmmu_gp10b.h>
u32 gp10b_mm_get_default_big_page_size(void) static u32 gp10b_mm_get_default_big_page_size(void)
{ {
return SZ_64K; return SZ_64K;
} }
u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g) static u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g)
{ {
return 36; return 36;
} }
int gp10b_init_mm_setup_hw(struct gk20a *g) static int gp10b_init_mm_setup_hw(struct gk20a *g)
{ {
struct mm_gk20a *mm = &g->mm; struct mm_gk20a *mm = &g->mm;
struct nvgpu_mem *inst_block = &mm->bar1.inst_block; struct nvgpu_mem *inst_block = &mm->bar1.inst_block;
@@ -68,7 +68,7 @@ int gp10b_init_mm_setup_hw(struct gk20a *g)
} }
int gb10b_init_bar2_vm(struct gk20a *g) static int gb10b_init_bar2_vm(struct gk20a *g)
{ {
int err; int err;
struct mm_gk20a *mm = &g->mm; struct mm_gk20a *mm = &g->mm;
@@ -99,7 +99,7 @@ clean_up_va:
return err; return err;
} }
int gb10b_init_bar2_mm_hw_setup(struct gk20a *g) static int gb10b_init_bar2_mm_hw_setup(struct gk20a *g)
{ {
struct mm_gk20a *mm = &g->mm; struct mm_gk20a *mm = &g->mm;
struct nvgpu_mem *inst_block = &mm->bar2.inst_block; struct nvgpu_mem *inst_block = &mm->bar2.inst_block;
@@ -333,13 +333,13 @@ static const struct gk20a_mmu_level gp10b_mm_levels[] = {
{.update_entry = NULL} {.update_entry = NULL}
}; };
const struct gk20a_mmu_level *gp10b_mm_get_mmu_levels(struct gk20a *g, static const struct gk20a_mmu_level *gp10b_mm_get_mmu_levels(struct gk20a *g,
u32 big_page_size) u32 big_page_size)
{ {
return gp10b_mm_levels; return gp10b_mm_levels;
} }
void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block, static void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block,
struct vm_gk20a *vm) struct vm_gk20a *vm)
{ {
u64 pdb_addr = nvgpu_mem_get_addr(g, vm->pdb.mem); u64 pdb_addr = nvgpu_mem_get_addr(g, vm->pdb.mem);
@@ -360,7 +360,7 @@ void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block,
ram_in_page_dir_base_hi_f(pdb_addr_hi)); ram_in_page_dir_base_hi_f(pdb_addr_hi));
} }
void gp10b_remove_bar2_vm(struct gk20a *g) static void gp10b_remove_bar2_vm(struct gk20a *g)
{ {
struct mm_gk20a *mm = &g->mm; struct mm_gk20a *mm = &g->mm;
@@ -368,3 +368,17 @@ void gp10b_remove_bar2_vm(struct gk20a *g)
gk20a_free_inst_block(g, &mm->bar2.inst_block); gk20a_free_inst_block(g, &mm->bar2.inst_block);
nvgpu_vm_put(mm->bar2.vm); nvgpu_vm_put(mm->bar2.vm);
} }
void gp10b_init_mm(struct gpu_ops *gops)
{
gm20b_init_mm(gops);
gops->mm.get_default_big_page_size = gp10b_mm_get_default_big_page_size;
gops->mm.get_physical_addr_bits = gp10b_mm_get_physical_addr_bits;
gops->mm.init_mm_setup_hw = gp10b_init_mm_setup_hw;
gops->mm.init_bar2_vm = gb10b_init_bar2_vm;
gops->mm.init_bar2_mm_hw_setup = gb10b_init_bar2_mm_hw_setup;
gops->mm.get_mmu_levels = gp10b_mm_get_mmu_levels;
gops->mm.init_pdb = gp10b_mm_init_pdb;
gops->mm.remove_bar2_vm = gp10b_remove_bar2_vm;
}

19
drivers/gpu/nvgpu/gp10b/mm_gp10b.h
View File

@@ -1,5 +1,5 @@
/* /*
* Copyright (c) 2014-2017, NVIDIA CORPORATION. All rights reserved. * Copyright (c) 2014, NVIDIA CORPORATION. All rights reserved.
* *
* This program is free software; you can redistribute it and/or modify it * This program is free software; you can redistribute it and/or modify it
* under the terms and conditions of the GNU General Public License, * under the terms and conditions of the GNU General Public License,
@@ -14,20 +14,7 @@
#ifndef MM_GP10B_H #ifndef MM_GP10B_H
#define MM_GP10B_H #define MM_GP10B_H
struct gk20a; struct gpu_ops;
struct gk20a_mmu_level;
struct nvgpu_mem;
struct vm_gk20a;
u32 gp10b_mm_get_default_big_page_size(void);
u32 gp10b_mm_get_physical_addr_bits(struct gk20a *g);
int gp10b_init_mm_setup_hw(struct gk20a *g);
int gb10b_init_bar2_vm(struct gk20a *g);
int gb10b_init_bar2_mm_hw_setup(struct gk20a *g);
const struct gk20a_mmu_level *gp10b_mm_get_mmu_levels(struct gk20a *g,
u32 big_page_size);
void gp10b_mm_init_pdb(struct gk20a *g, struct nvgpu_mem *inst_block,
struct vm_gk20a *vm);
void gp10b_remove_bar2_vm(struct gk20a *g);
void gp10b_init_mm(struct gpu_ops *gops);
#endif #endif