gpu: nvgpu: Move common DMA code to common/mm

This migrates the common DMA code (os agnostic) to the
common directory. This new unit will be the common DMA
allocator that lets users allocate SYSMEM, VIDMEM, or
either. Other units will be responsible for actually
handling the mechanics of allocating VIDMEM or SYSMEM.

Also update the names of the DMA related files so that
tmake doesn't complain about duplicate C file names. To
do this call the common DMA file dma.c and prepend the
OS to the other DMA files. So now we have:

  common/mm/dma.c
  os/posix/posix-dma.c
  os/linux/linux-dma.c

JIRA NVGPU-990

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

1 files changed, 2 insertions, 171 deletions

diff --git a/drivers/gpu/nvgpu/os/linux/dma.c b/drivers/gpu/nvgpu/os/linux/linux-dma.c
index 77669493..a42e7cb5 100644
--- a/drivers/gpu/nvgpu/os/linux/dma.c
+++ b/drivers/gpu/nvgpu/os/linux/linux-dma.c
@@ -174,45 +174,6 @@ static void nvgpu_dma_flags_to_attrs(struct dma_attrs *attrs,
 #undef ATTR_ARG
 }
 
-int nvgpu_dma_alloc(struct gk20a *g, size_t size, struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_flags(g, 0, size, mem);
-}
-
-int nvgpu_dma_alloc_flags(struct gk20a *g, unsigned long flags, size_t size,
-                struct nvgpu_mem *mem)
-{
-        if (!nvgpu_is_enabled(g, NVGPU_MM_UNIFIED_MEMORY)) {
-                /*
-                 * Force the no-kernel-mapping flag on because we don't support
-                 * the lack of it for vidmem - the user should not care when
-                 * using nvgpu_gmmu_alloc_map and it's vidmem, or if there's a
-                 * difference, the user should use the flag explicitly anyway.
-                 *
-                 * Incoming flags are ignored here, since bits other than the
-                 * no-kernel-mapping flag are ignored by the vidmem mapping
-                 * functions anyway.
-                 */
-                int err = nvgpu_dma_alloc_flags_vid(g,
-                                NVGPU_DMA_NO_KERNEL_MAPPING,
-                                size, mem);
-
-                if (!err)
-                        return 0;
-                /*
-                 * Fall back to sysmem (which may then also fail) in case
-                 * vidmem is exhausted.
-                 */
-        }
-
-        return nvgpu_dma_alloc_flags_sys(g, flags, size, mem);
-}
-
-int nvgpu_dma_alloc_sys(struct gk20a *g, size_t size, struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_flags_sys(g, 0, size, mem);
-}
-
 int nvgpu_dma_alloc_flags_sys(struct gk20a *g, unsigned long flags,
                 size_t size, struct nvgpu_mem *mem)
 {
@@ -302,25 +263,6 @@ fail_free_dma:
         return err;
 }
 
-int nvgpu_dma_alloc_vid(struct gk20a *g, size_t size, struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_flags_vid(g,
-                        NVGPU_DMA_NO_KERNEL_MAPPING, size, mem);
-}
-
-int nvgpu_dma_alloc_flags_vid(struct gk20a *g, unsigned long flags,
-                size_t size, struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_flags_vid_at(g, flags, size, mem, 0);
-}
-
-int nvgpu_dma_alloc_vid_at(struct gk20a *g,
-                size_t size, struct nvgpu_mem *mem, u64 at)
-{
-        return nvgpu_dma_alloc_flags_vid_at(g,
-                        NVGPU_DMA_NO_KERNEL_MAPPING, size, mem, at);
-}
-
 int nvgpu_dma_alloc_flags_vid_at(struct gk20a *g, unsigned long flags,
                 size_t size, struct nvgpu_mem *mem, u64 at)
 {
@@ -405,97 +347,7 @@ fail_physfree:
 #endif
 }
 
-int nvgpu_dma_alloc_map(struct vm_gk20a *vm, size_t size,
-                struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_map_flags(vm, 0, size, mem);
-}
-
-int nvgpu_dma_alloc_map_flags(struct vm_gk20a *vm, unsigned long flags,
-                size_t size, struct nvgpu_mem *mem)
-{
-        if (!nvgpu_is_enabled(gk20a_from_vm(vm), NVGPU_MM_UNIFIED_MEMORY)) {
-                /*
-                 * Force the no-kernel-mapping flag on because we don't support
-                 * the lack of it for vidmem - the user should not care when
-                 * using nvgpu_dma_alloc_map and it's vidmem, or if there's a
-                 * difference, the user should use the flag explicitly anyway.
-                 */
-                int err = nvgpu_dma_alloc_map_flags_vid(vm,
-                                flags | NVGPU_DMA_NO_KERNEL_MAPPING,
-                                size, mem);
-
-                if (!err)
-                        return 0;
-                /*
-                 * Fall back to sysmem (which may then also fail) in case
-                 * vidmem is exhausted.
-                 */
-        }
-
-        return nvgpu_dma_alloc_map_flags_sys(vm, flags, size, mem);
-}
-
-int nvgpu_dma_alloc_map_sys(struct vm_gk20a *vm, size_t size,
-                struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_map_flags_sys(vm, 0, size, mem);
-}
-
-int nvgpu_dma_alloc_map_flags_sys(struct vm_gk20a *vm, unsigned long flags,
-                size_t size, struct nvgpu_mem *mem)
-{
-        int err = nvgpu_dma_alloc_flags_sys(vm->mm->g, flags, size, mem);
-
-        if (err)
-                return err;
-
-        mem->gpu_va = nvgpu_gmmu_map(vm, mem, size, 0,
-                                     gk20a_mem_flag_none, false,
-                                     mem->aperture);
-        if (!mem->gpu_va) {
-                err = -ENOMEM;
-                goto fail_free;
-        }
-
-        return 0;
-
-fail_free:
-        nvgpu_dma_free(vm->mm->g, mem);
-        return err;
-}
-
-int nvgpu_dma_alloc_map_vid(struct vm_gk20a *vm, size_t size,
-                struct nvgpu_mem *mem)
-{
-        return nvgpu_dma_alloc_map_flags_vid(vm,
-                        NVGPU_DMA_NO_KERNEL_MAPPING, size, mem);
-}
-
-int nvgpu_dma_alloc_map_flags_vid(struct vm_gk20a *vm, unsigned long flags,
-                size_t size, struct nvgpu_mem *mem)
-{
-        int err = nvgpu_dma_alloc_flags_vid(vm->mm->g, flags, size, mem);
-
-        if (err)
-                return err;
-
-        mem->gpu_va = nvgpu_gmmu_map(vm, mem, size, 0,
-                                     gk20a_mem_flag_none, false,
-                                     mem->aperture);
-        if (!mem->gpu_va) {
-                err = -ENOMEM;
-                goto fail_free;
-        }
-
-        return 0;
-
-fail_free:
-        nvgpu_dma_free(vm->mm->g, mem);
-        return err;
-}
-
-static void nvgpu_dma_free_sys(struct gk20a *g, struct nvgpu_mem *mem)
+void nvgpu_dma_free_sys(struct gk20a *g, struct nvgpu_mem *mem)
 {
         struct device *d = dev_from_gk20a(g);
 
@@ -551,7 +403,7 @@ static void nvgpu_dma_free_sys(struct gk20a *g, struct nvgpu_mem *mem)
         mem->aperture = APERTURE_INVALID;
 }
 
-static void nvgpu_dma_free_vid(struct gk20a *g, struct nvgpu_mem *mem)
+void nvgpu_dma_free_vid(struct gk20a *g, struct nvgpu_mem *mem)
 {
 #if defined(CONFIG_GK20A_VIDMEM)
         size_t mem_size = mem->size;
@@ -590,27 +442,6 @@ static void nvgpu_dma_free_vid(struct gk20a *g, struct nvgpu_mem *mem)
 #endif
 }
 
-void nvgpu_dma_free(struct gk20a *g, struct nvgpu_mem *mem)
-{
-        switch (mem->aperture) {
-        case APERTURE_SYSMEM:
-                return nvgpu_dma_free_sys(g, mem);
-        case APERTURE_VIDMEM:
-                return nvgpu_dma_free_vid(g, mem);
-        default:
-                break; /* like free() on "null" memory */
-        }
-}
-
-void nvgpu_dma_unmap_free(struct vm_gk20a *vm, struct nvgpu_mem *mem)
-{
-        if (mem->gpu_va)
-                nvgpu_gmmu_unmap(vm, mem, mem->gpu_va);
-        mem->gpu_va = 0;
-
-        nvgpu_dma_free(vm->mm->g, mem);
-}
-
 int nvgpu_get_sgtable_attrs(struct gk20a *g, struct sg_table **sgt,
                       void *cpuva, u64 iova, size_t size, unsigned long flags)
 {