change system file

hc

2024-10-09 244b2c5ca8b14627e4a17755e5922221e121c771

 kernel/drivers/rknpu/rknpu_mem.c
..
..
@@ -15,6 +15,8 @@
15
15
 #include "rknpu_ioctl.h"
16
16
 #include "rknpu_mem.h"
17
17
 
18
+#ifdef CONFIG_ROCKCHIP_RKNPU_DMA_HEAP
19
+
18
20
 int rknpu_mem_create_ioctl(struct rknpu_device *rknpu_dev, unsigned long data,
19
21
 			   struct file *file)
20
22
 {
..
..
@@ -107,22 +109,27 @@
107
109
 			  __LINE__, &phys, length);
108
110
 	}
109
111
 
110
-	page_count = length >> PAGE_SHIFT;
111
-	pages = kmalloc_array(page_count, sizeof(struct page), GFP_KERNEL);
112
-	if (!pages) {
113
-		LOG_ERROR("alloc pages failed\n");
114
-		ret = -ENOMEM;
115
-		goto err_detach_dma_buf;
116
-	}
112
+	if (args.flags & RKNPU_MEM_KERNEL_MAPPING) {
113
+		page_count = length >> PAGE_SHIFT;
114
+		pages = vmalloc(page_count * sizeof(struct page));
115
+		if (!pages) {
116
+			LOG_ERROR("alloc pages failed\n");
117
+			ret = -ENOMEM;
118
+			goto err_detach_dma_buf;
119
+		}
117
120
 
118
-	for (i = 0; i < page_count; i++)
119
-		pages[i] = &page[i];
121
+		for (i = 0; i < page_count; i++)
122
+			pages[i] = &page[i];
120
123
 
121
-	rknpu_obj->kv_addr = vmap(pages, page_count, VM_MAP, PAGE_KERNEL);
122
-	if (!rknpu_obj->kv_addr) {
123
-		LOG_ERROR("vmap pages addr failed\n");
124
-		ret = -ENOMEM;
125
-		goto err_free_pages;
124
+		rknpu_obj->kv_addr =
125
+			vmap(pages, page_count, VM_MAP, PAGE_KERNEL);
126
+		if (!rknpu_obj->kv_addr) {
127
+			LOG_ERROR("vmap pages addr failed\n");
128
+			ret = -ENOMEM;
129
+			goto err_free_pages;
130
+		}
131
+		vfree(pages);
132
+		pages = NULL;
126
133
 	}
127
134
 
128
135
 	rknpu_obj->size = PAGE_ALIGN(args.size);
..
..
@@ -146,7 +153,6 @@
146
153
 		goto err_unmap_kv_addr;
147
154
 	}
148
155
 
149
-	kfree(pages);
150
156
 	dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
151
157
 	dma_buf_detach(dmabuf, attachment);
152
158
 
..
..
@@ -169,7 +175,8 @@
169
175
 	rknpu_obj->kv_addr = NULL;
170
176
 
171
177
 err_free_pages:
172
-	kfree(pages);
178
+	vfree(pages);
179
+	pages = NULL;
173
180
 
174
181
 err_detach_dma_buf:
175
182
 	dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
..
..
@@ -292,7 +299,9 @@
292
299
 {
293
300
 	struct rknpu_mem_object *rknpu_obj = NULL;
294
301
 	struct rknpu_mem_sync args;
302
+#ifdef CONFIG_DMABUF_PARTIAL
295
303
 	struct dma_buf *dmabuf;
304
+#endif
296
305
 	int ret = -EFAULT;
297
306
 
298
307
 	if (unlikely(copy_from_user(&args, (struct rknpu_mem_sync *)data,
..
..
@@ -310,7 +319,6 @@
310
319
 	}
311
320
 
312
321
 	rknpu_obj = (struct rknpu_mem_object *)(uintptr_t)args.obj_addr;
313
-	dmabuf = rknpu_obj->dmabuf;
314
322
 
315
323
 #ifndef CONFIG_DMABUF_PARTIAL
316
324
 	if (args.flags & RKNPU_MEM_SYNC_TO_DEVICE) {
..
..
@@ -322,6 +330,7 @@
322
330
 				   DMA_FROM_DEVICE, true);
323
331
 	}
324
332
 #else
333
+	dmabuf = rknpu_obj->dmabuf;
325
334
 	if (args.flags & RKNPU_MEM_SYNC_TO_DEVICE) {
326
335
 		dmabuf->ops->end_cpu_access_partial(dmabuf, DMA_TO_DEVICE,
327
336
 						    args.offset, args.size);
..
..
@@ -334,3 +343,5 @@
334
343
 
335
344
 	return 0;
336
345
 }
346
+
347
+#endif