gpu: nvgpu: Refactor gk20a_vm_alloc_va()

This function is an internal function to the VM manager that allocates
virtual memory space in the GVA allocator. It is unfortunately used in
the vGPU code, though. In any event, this patch cleans up and moves the
implementation of these functions into the VM common code.

JIRA NVGPU-12
JIRA NVGPU-30

Change-Id: I24a3d29b5fcb12615df27d2ac82891d1bacfe541
Signed-off-by: Alex Waterman <alexw@nvidia.com>
Reviewed-on: http://git-master/r/1477745
Reviewed-by: mobile promotions <svcmobile_promotions@nvidia.com>
Tested-by: mobile promotions <svcmobile_promotions@nvidia.com>

4 files changed, 25 insertions, 26 deletions

diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
index b5c9735c..cac1db29 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_gr_gp10b.c
@@ -40,8 +40,7 @@ static void vgpu_gr_gp10b_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
         err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
         WARN_ON(err || msg.ret);
 
-        gk20a_vm_free_va(vm, gr_ctx->mem.gpu_va, gr_ctx->mem.size,
-                        gmmu_page_size_kernel);
+        __nvgpu_vm_free_va(vm, gr_ctx->mem.gpu_va, gmmu_page_size_kernel);
 
         nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.pagepool_ctxsw_buffer);
         nvgpu_dma_unmap_free(vm, &gr_ctx->t18x.betacb_ctxsw_buffer);
diff --git a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
index 15ff10b9..f425b7e5 100644
--- a/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
+++ b/drivers/gpu/nvgpu/vgpu/gp10b/vgpu_mm_gp10b.c
@@ -81,7 +81,7 @@ static u64 vgpu_gp10b_locked_gmmu_map(struct vm_gk20a *vm,
 
         /* Allocate (or validate when map_offset != 0) the virtual address. */
         if (!map_offset) {
-                map_offset = gk20a_vm_alloc_va(vm, size, pgsz_idx);
+                map_offset = __nvgpu_vm_alloc_va(vm, size, pgsz_idx);
                 if (!map_offset) {
                         nvgpu_err(g, "failed to allocate va space");
                         err = -ENOMEM;
diff --git a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
index 42af9ee1..2198b115 100644
--- a/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/gr_vgpu.c
@@ -156,7 +156,7 @@ static int vgpu_gr_map_global_ctx_buffers(struct gk20a *g,
         /* FIXME: add VPR support */
 
         /* Circular Buffer */
-        gpu_va = gk20a_vm_alloc_va(ch_vm,
+        gpu_va = __nvgpu_vm_alloc_va(ch_vm,
                         gr->global_ctx_buffer[CIRCULAR].mem.size,
                         gmmu_page_size_kernel);
 
@@ -166,7 +166,7 @@ static int vgpu_gr_map_global_ctx_buffers(struct gk20a *g,
         g_bfr_size[CIRCULAR_VA] = gr->global_ctx_buffer[CIRCULAR].mem.size;
 
         /* Attribute Buffer */
-        gpu_va = gk20a_vm_alloc_va(ch_vm,
+        gpu_va = __nvgpu_vm_alloc_va(ch_vm,
                         gr->global_ctx_buffer[ATTRIBUTE].mem.size,
                         gmmu_page_size_kernel);
 
@@ -176,7 +176,7 @@ static int vgpu_gr_map_global_ctx_buffers(struct gk20a *g,
         g_bfr_size[ATTRIBUTE_VA] = gr->global_ctx_buffer[ATTRIBUTE].mem.size;
 
         /* Page Pool */
-        gpu_va = gk20a_vm_alloc_va(ch_vm,
+        gpu_va = __nvgpu_vm_alloc_va(ch_vm,
                         gr->global_ctx_buffer[PAGEPOOL].mem.size,
                         gmmu_page_size_kernel);
         if (!gpu_va)
@@ -185,7 +185,7 @@ static int vgpu_gr_map_global_ctx_buffers(struct gk20a *g,
         g_bfr_size[PAGEPOOL_VA] = gr->global_ctx_buffer[PAGEPOOL].mem.size;
 
         /* Priv register Access Map */
-        gpu_va = gk20a_vm_alloc_va(ch_vm,
+        gpu_va = __nvgpu_vm_alloc_va(ch_vm,
                         gr->global_ctx_buffer[PRIV_ACCESS_MAP].mem.size,
                         gmmu_page_size_kernel);
         if (!gpu_va)
@@ -211,8 +211,8 @@ static int vgpu_gr_map_global_ctx_buffers(struct gk20a *g,
  clean_up:
         for (i = 0; i < NR_GLOBAL_CTX_BUF_VA; i++) {
                 if (g_bfr_va[i]) {
-                        gk20a_vm_free_va(ch_vm, g_bfr_va[i],
-                                        g_bfr_size[i], gmmu_page_size_kernel);
+                        __nvgpu_vm_free_va(ch_vm, g_bfr_va[i],
+                                           gmmu_page_size_kernel);
                         g_bfr_va[i] = 0;
                 }
         }
@@ -242,8 +242,8 @@ static void vgpu_gr_unmap_global_ctx_buffers(struct channel_gk20a *c)
 
         for (i = 0; i < NR_GLOBAL_CTX_BUF_VA; i++) {
                 if (g_bfr_va[i]) {
-                        gk20a_vm_free_va(ch_vm, g_bfr_va[i], g_bfr_size[i],
-                                        gmmu_page_size_kernel);
+                        __nvgpu_vm_free_va(ch_vm, g_bfr_va[i],
+                                           gmmu_page_size_kernel);
                         g_bfr_va[i] = 0;
                         g_bfr_size[i] = 0;
                 }
@@ -277,7 +277,7 @@ int vgpu_gr_alloc_gr_ctx(struct gk20a *g,
                 return -ENOMEM;
 
         gr_ctx->mem.size = gr->ctx_vars.buffer_total_size;
-        gr_ctx->mem.gpu_va = gk20a_vm_alloc_va(vm,
+        gr_ctx->mem.gpu_va = __nvgpu_vm_alloc_va(vm,
                                                 gr_ctx->mem.size,
                                                 gmmu_page_size_kernel);
 
@@ -296,8 +296,8 @@ int vgpu_gr_alloc_gr_ctx(struct gk20a *g,
 
         if (unlikely(err)) {
                 nvgpu_err(g, "fail to alloc gr_ctx");
-                gk20a_vm_free_va(vm, gr_ctx->mem.gpu_va,
-                                 gr_ctx->mem.size, gmmu_page_size_kernel);
+                __nvgpu_vm_free_va(vm, gr_ctx->mem.gpu_va,
+                                   gmmu_page_size_kernel);
                 nvgpu_kfree(g, gr_ctx);
         } else {
                 gr_ctx->virt_ctx = p->gr_ctx_handle;
@@ -323,8 +323,8 @@ void vgpu_gr_free_gr_ctx(struct gk20a *g, struct vm_gk20a *vm,
                 err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
                 WARN_ON(err || msg.ret);
 
-                gk20a_vm_free_va(vm, gr_ctx->mem.gpu_va, gr_ctx->mem.size,
-                                gmmu_page_size_kernel);
+                __nvgpu_vm_free_va(vm, gr_ctx->mem.gpu_va,
+                                   gmmu_page_size_kernel);
                 nvgpu_kfree(g, gr_ctx);
         }
 }
@@ -349,7 +349,7 @@ static int vgpu_gr_alloc_channel_patch_ctx(struct gk20a *g,
         gk20a_dbg_fn("");
 
         patch_ctx->mem.size = 128 * sizeof(u32);
-        patch_ctx->mem.gpu_va = gk20a_vm_alloc_va(ch_vm,
+        patch_ctx->mem.gpu_va = __nvgpu_vm_alloc_va(ch_vm,
                                                 patch_ctx->mem.size,
                                                 gmmu_page_size_kernel);
         if (!patch_ctx->mem.gpu_va)
@@ -361,8 +361,8 @@ static int vgpu_gr_alloc_channel_patch_ctx(struct gk20a *g,
         p->patch_ctx_va = patch_ctx->mem.gpu_va;
         err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
         if (err || msg.ret) {
-                gk20a_vm_free_va(ch_vm, patch_ctx->mem.gpu_va,
-                                 patch_ctx->mem.size, gmmu_page_size_kernel);
+                __nvgpu_vm_free_va(ch_vm, patch_ctx->mem.gpu_va,
+                                   gmmu_page_size_kernel);
                 err = -ENOMEM;
         }
 
@@ -387,8 +387,8 @@ static void vgpu_gr_free_channel_patch_ctx(struct channel_gk20a *c)
                 err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
                 WARN_ON(err || msg.ret);
 
-                gk20a_vm_free_va(ch_vm, patch_ctx->mem.gpu_va,
-                                 patch_ctx->mem.size, gmmu_page_size_kernel);
+                __nvgpu_vm_free_va(ch_vm, patch_ctx->mem.gpu_va,
+                                   gmmu_page_size_kernel);
                 patch_ctx->mem.gpu_va = 0;
         }
 }
@@ -413,8 +413,8 @@ static void vgpu_gr_free_channel_pm_ctx(struct channel_gk20a *c)
         err = vgpu_comm_sendrecv(&msg, sizeof(msg), sizeof(msg));
         WARN_ON(err || msg.ret);
 
-        gk20a_vm_free_va(c->vm, pm_ctx->mem.gpu_va, pm_ctx->mem.size,
-                        gmmu_page_size_kernel);
+        __nvgpu_vm_free_va(c->vm, pm_ctx->mem.gpu_va,
+                           gmmu_page_size_kernel);
         pm_ctx->mem.gpu_va = 0;
 }
 
@@ -1046,7 +1046,7 @@ static int vgpu_gr_update_hwpm_ctxsw_mode(struct gk20a *g,
 
                 /* Allocate buffer if necessary */
                 if (pm_ctx->mem.gpu_va == 0) {
-                        pm_ctx->mem.gpu_va = gk20a_vm_alloc_va(ch->vm,
+                        pm_ctx->mem.gpu_va = __nvgpu_vm_alloc_va(ch->vm,
                                         g->gr.ctx_vars.pm_ctxsw_image_size,
                                         gmmu_page_size_kernel);
 
diff --git a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
index b42fbcb3..b8b5985c 100644
--- a/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
+++ b/drivers/gpu/nvgpu/vgpu/mm_vgpu.c
@@ -106,7 +106,7 @@ static u64 vgpu_locked_gmmu_map(struct vm_gk20a *vm,
 
         /* Allocate (or validate when map_offset != 0) the virtual address. */
         if (!map_offset) {
-                map_offset = gk20a_vm_alloc_va(vm, size,
+                map_offset = __nvgpu_vm_alloc_va(vm, size,
                                           pgsz_idx);
                 if (!map_offset) {
                         nvgpu_err(g, "failed to allocate va space\n");
@@ -180,7 +180,7 @@ static void vgpu_locked_gmmu_unmap(struct vm_gk20a *vm,
         gk20a_dbg_fn("");
 
         if (va_allocated) {
-                err = gk20a_vm_free_va(vm, vaddr, size, pgsz_idx);
+                err = __nvgpu_vm_free_va(vm, vaddr, pgsz_idx);
                 if (err) {
                         dev_err(dev_from_vm(vm),
                                 "failed to free va");