habanalabs: make use of dma_mmap_coherent

Add dma_mmap_coherent() for goya and gaudi to match their use of
dma_alloc_coherent(), see the Link tag for why.

Link: https://lore.kernel.org/lkml/20200609091727.GA23814@lst.de/
Cc: Christoph Hellwig <hch@lst.de>
Cc: Zhang Li <li.zhang@bitmain.com>
Cc: Ding Z Nan <oshack@hotmail.com>
Signed-off-by: Hillf Danton <hdanton@sina.com>
Reviewed-by: Oded Gabbay <oded.gabbay@gmail.com>
Signed-off-by: Oded Gabbay <oded.gabbay@gmail.com>

diff --git a/drivers/misc/habanalabs/common/command_buffer.c b/drivers/misc/habanalabs/common/command_buffer.c
index 6563e4d..ba63cee 100644 (file)
--- a/drivers/misc/habanalabs/common/command_buffer.c
+++ b/drivers/misc/habanalabs/common/command_buffer.c
@@ -300,7 +300,6 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma)
 {
        struct hl_device *hdev = hpriv->hdev;
        struct hl_cb *cb;
-       phys_addr_t address;
        u32 handle, user_cb_size;
        int rc;
 
@@ -360,12 +359,8 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, struct vm_area_struct *vma)
 
        vma->vm_private_data = cb;
 
-       /* Calculate address for CB */
-       address = virt_to_phys((void *) (uintptr_t) cb->kernel_address);
-
-       rc = hdev->asic_funcs->cb_mmap(hdev, vma, cb->kernel_address,
-                                       address, cb->size);
-
+       rc = hdev->asic_funcs->cb_mmap(hdev, vma, (void *) cb->kernel_address,
+                                       cb->bus_address, cb->size);
        if (rc) {
                spin_lock(&cb->lock);
                cb->mmap = false;

diff --git a/drivers/misc/habanalabs/common/habanalabs.h b/drivers/misc/habanalabs/common/habanalabs.h
index cdb7a67..6ea8ae6 100644 (file)
--- a/drivers/misc/habanalabs/common/habanalabs.h
+++ b/drivers/misc/habanalabs/common/habanalabs.h
@@ -710,7 +710,7 @@ struct hl_asic_funcs {
        int (*suspend)(struct hl_device *hdev);
        int (*resume)(struct hl_device *hdev);
        int (*cb_mmap)(struct hl_device *hdev, struct vm_area_struct *vma,
-                       u64 kaddress, phys_addr_t paddress, u32 size);
+                       void *cpu_addr, dma_addr_t dma_addr, size_t size);
        void (*ring_doorbell)(struct hl_device *hdev, u32 hw_queue_id, u32 pi);
        void (*pqe_write)(struct hl_device *hdev, __le64 *pqe,
                        struct hl_bd *bd);

diff --git a/drivers/misc/habanalabs/gaudi/gaudi.c b/drivers/misc/habanalabs/gaudi/gaudi.c
index 0840197..bc7e7e3 100644 (file)
--- a/drivers/misc/habanalabs/gaudi/gaudi.c
+++ b/drivers/misc/habanalabs/gaudi/gaudi.c
@@ -3091,17 +3091,16 @@ static int gaudi_resume(struct hl_device *hdev)
 }
 
 static int gaudi_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,
-               u64 kaddress, phys_addr_t paddress, u32 size)
+                       void *cpu_addr, dma_addr_t dma_addr, size_t size)
 {
        int rc;
 
        vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |
                        VM_DONTCOPY | VM_NORESERVE;
 
-       rc = remap_pfn_range(vma, vma->vm_start, paddress >> PAGE_SHIFT,
-                               size, vma->vm_page_prot);
+       rc = dma_mmap_coherent(hdev->dev, vma, cpu_addr, dma_addr, size);
        if (rc)
-               dev_err(hdev->dev, "remap_pfn_range error %d", rc);
+               dev_err(hdev->dev, "dma_mmap_coherent error %d", rc);
 
        return rc;
 }

diff --git a/drivers/misc/habanalabs/goya/goya.c b/drivers/misc/habanalabs/goya/goya.c
index 88847eb..94b7958 100644 (file)
--- a/drivers/misc/habanalabs/goya/goya.c
+++ b/drivers/misc/habanalabs/goya/goya.c
@@ -2661,17 +2661,16 @@ int goya_resume(struct hl_device *hdev)
 }
 
 static int goya_cb_mmap(struct hl_device *hdev, struct vm_area_struct *vma,
-               u64 kaddress, phys_addr_t paddress, u32 size)
+                       void *cpu_addr, dma_addr_t dma_addr, size_t size)
 {
        int rc;
 
        vma->vm_flags |= VM_IO | VM_PFNMAP | VM_DONTEXPAND | VM_DONTDUMP |
                        VM_DONTCOPY | VM_NORESERVE;
 
-       rc = remap_pfn_range(vma, vma->vm_start, paddress >> PAGE_SHIFT,
-                               size, vma->vm_page_prot);
+       rc = dma_mmap_coherent(hdev->dev, vma, cpu_addr, dma_addr, size);
        if (rc)
-               dev_err(hdev->dev, "remap_pfn_range error %d", rc);
+               dev_err(hdev->dev, "dma_mmap_coherent error %d", rc);
 
        return rc;
 }