From 102a0743326a03cd1a1202ceda21e175b7d3575c Mon Sep 17 00:00:00 2001 From: hc <hc@nodka.com> Date: Tue, 20 Feb 2024 01:20:52 +0000 Subject: [PATCH] add new system file --- kernel/drivers/rknpu/rknpu_mem.c | 35 +++++++++++++++++++---------------- 1 files changed, 19 insertions(+), 16 deletions(-) diff --git a/kernel/drivers/rknpu/rknpu_mem.c b/kernel/drivers/rknpu/rknpu_mem.c index 5242f15..858c21f 100644 --- a/kernel/drivers/rknpu/rknpu_mem.c +++ b/kernel/drivers/rknpu/rknpu_mem.c @@ -109,22 +109,27 @@ __LINE__, &phys, length); } - page_count = length >> PAGE_SHIFT; - pages = vmalloc(page_count * sizeof(struct page)); - if (!pages) { - LOG_ERROR("alloc pages failed\n"); - ret = -ENOMEM; - goto err_detach_dma_buf; - } + if (args.flags & RKNPU_MEM_KERNEL_MAPPING) { + page_count = length >> PAGE_SHIFT; + pages = vmalloc(page_count * sizeof(struct page)); + if (!pages) { + LOG_ERROR("alloc pages failed\n"); + ret = -ENOMEM; + goto err_detach_dma_buf; + } - for (i = 0; i < page_count; i++) - pages[i] = &page[i]; + for (i = 0; i < page_count; i++) + pages[i] = &page[i]; - rknpu_obj->kv_addr = vmap(pages, page_count, VM_MAP, PAGE_KERNEL); - if (!rknpu_obj->kv_addr) { - LOG_ERROR("vmap pages addr failed\n"); - ret = -ENOMEM; - goto err_free_pages; + rknpu_obj->kv_addr = + vmap(pages, page_count, VM_MAP, PAGE_KERNEL); + if (!rknpu_obj->kv_addr) { + LOG_ERROR("vmap pages addr failed\n"); + ret = -ENOMEM; + goto err_free_pages; + } + vfree(pages); + pages = NULL; } rknpu_obj->size = PAGE_ALIGN(args.size); @@ -148,8 +153,6 @@ goto err_unmap_kv_addr; } - vfree(pages); - pages = NULL; dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL); dma_buf_detach(dmabuf, attachment); -- Gitblit v1.6.2