lkml.org 
[lkml]   [2020]   [Aug]   [22]   [last100]   RSS Feed
Views: [wrap][no wrap]   [headers]  [forward] 
 
Messages in this thread
/
From
Date
SubjectRe: [RFC PATCH] habanalabs: goya: make use of dma_mmap_coherent
On Mon, Aug 17, 2020 at 4:48 PM Hillf Danton <hdanton@sina.com> wrote:
>
>
> Add dma_mmap_coherent() to match dma_alloc_coherent(), see the Link tag
> for why.
>
> Link: https://lore.kernel.org/lkml/20200609091727.GA23814@lst.de/
> Signed-off-by: Hillf Danton <hdanton@sina.com>
> ---
>
> --- a/drivers/misc/habanalabs/common/habanalabs.h
> +++ b/drivers/misc/habanalabs/common/habanalabs.h
> @@ -679,7 +679,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);
> --- a/drivers/misc/habanalabs/goya/goya.c
> +++ b/drivers/misc/habanalabs/goya/goya.c
> @@ -2642,15 +2642,14 @@ 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);
>
> --- a/drivers/misc/habanalabs/common/command_buffer.c
> +++ b/drivers/misc/habanalabs/common/command_buffer.c
> @@ -299,7 +299,6 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, s
> {
> struct hl_device *hdev = hpriv->hdev;
> struct hl_cb *cb;
> - phys_addr_t address;
> u32 handle;
> int rc;
>
> @@ -344,12 +343,8 @@ int hl_cb_mmap(struct hl_fpriv *hpriv, s
>
> 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;
>

Hi Hillf,
Could you please also fix gaudi_cb_mmap() and resend this patch ?
Thanks,
Oded

\
 
 \ /
  Last update: 2020-08-22 18:12    [W:0.981 / U:13.164 seconds]
©2003-2020 Jasper Spaans|hosted at Digital Ocean and TransIP|Read the blog|Advertise on this site