gpu: nvgpu: rename ops.mm.get_physical_addr_bits

Rename get_physical_addr_bits and related functions to something that
more clearly conveys what they are doing. The basic idea of these
functions is to translate from a physical GPU address to a IOMMU GPU
address. To do that a particular bit (that varies from chip to chip)
is added to the physical address.

JIRA NVGPU-68

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

2 files changed, 15 insertions, 3 deletions

diff --git a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
index 8cf3011e..0be41a44 100644
--- a/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/linux/nvgpu_mem.c
@@ -268,7 +268,7 @@ u64 nvgpu_mem_get_addr_sgl(struct gk20a *g, struct scatterlist *sgl)
         if (sg_dma_address(sgl) == DMA_ERROR_CODE)
                 return 0;
 
-        return gk20a_mm_smmu_vaddr_translate(g, sg_dma_address(sgl));
+        return nvgpu_mem_iommu_translate(g, sg_dma_address(sgl));
 }
 
 /*
@@ -452,8 +452,8 @@ static u64 nvgpu_mem_linux_sgl_gpu_addr(struct gk20a *g, void *sgl,
         if (sg_dma_address((struct scatterlist *)sgl) == DMA_ERROR_CODE)
                 return 0;
 
-        return gk20a_mm_smmu_vaddr_translate(g,
-                        sg_dma_address((struct scatterlist *)sgl));
+        return nvgpu_mem_iommu_translate(g,
+                                sg_dma_address((struct scatterlist *)sgl));
 }
 
 static void nvgpu_mem_linux_sgl_free(struct gk20a *g, struct nvgpu_sgt *sgt)
diff --git a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
index 52d20883..faee482d 100644
--- a/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
+++ b/drivers/gpu/nvgpu/common/mm/nvgpu_mem.c
@@ -22,6 +22,7 @@
 
 #include <nvgpu/kmem.h>
 #include <nvgpu/nvgpu_mem.h>
+#include <nvgpu/dma.h>
 
 #include "gk20a/gk20a.h"
 
@@ -56,3 +57,14 @@ void nvgpu_sgt_free(struct nvgpu_sgt *sgt, struct gk20a *g)
         if (sgt && sgt->ops->sgt_free)
                 sgt->ops->sgt_free(g, sgt);
 }
+
+u64 nvgpu_mem_iommu_translate(struct gk20a *g, u64 phys)
+{
+        /* ensure it is not vidmem allocation */
+        WARN_ON(is_vidmem_page_alloc(phys));
+
+        if (nvgpu_iommuable(g) && g->ops.mm.get_iommu_bit)
+                return phys | 1ULL << g->ops.mm.get_iommu_bit(g);
+
+        return phys;
+}