kernel_5.10 no rt

hc

2023-12-11 6778948f9de86c3cfaf36725a7c87dcff9ba247f

 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
 {
..
..
@@ -108,7 +110,7 @@
108
110
 	}
109
111
 
110
112
 	page_count = length >> PAGE_SHIFT;
111
-	pages = kmalloc_array(page_count, sizeof(struct page), GFP_KERNEL);
113
+	pages = vmalloc(page_count * sizeof(struct page));
112
114
 	if (!pages) {
113
115
 		LOG_ERROR("alloc pages failed\n");
114
116
 		ret = -ENOMEM;
..
..
@@ -146,7 +148,8 @@
146
148
 		goto err_unmap_kv_addr;
147
149
 	}
148
150
 
149
-	kfree(pages);
151
+	vfree(pages);
152
+	pages = NULL;
150
153
 	dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
151
154
 	dma_buf_detach(dmabuf, attachment);
152
155
 
..
..
@@ -169,7 +172,8 @@
169
172
 	rknpu_obj->kv_addr = NULL;
170
173
 
171
174
 err_free_pages:
172
-	kfree(pages);
175
+	vfree(pages);
176
+	pages = NULL;
173
177
 
174
178
 err_detach_dma_buf:
175
179
 	dma_buf_unmap_attachment(attachment, table, DMA_BIDIRECTIONAL);
..
..
@@ -292,7 +296,9 @@
292
296
 {
293
297
 	struct rknpu_mem_object *rknpu_obj = NULL;
294
298
 	struct rknpu_mem_sync args;
299
+#ifdef CONFIG_DMABUF_PARTIAL
295
300
 	struct dma_buf *dmabuf;
301
+#endif
296
302
 	int ret = -EFAULT;
297
303
 
298
304
 	if (unlikely(copy_from_user(&args, (struct rknpu_mem_sync *)data,
..
..
@@ -310,7 +316,6 @@
310
316
 	}
311
317
 
312
318
 	rknpu_obj = (struct rknpu_mem_object *)(uintptr_t)args.obj_addr;
313
-	dmabuf = rknpu_obj->dmabuf;
314
319
 
315
320
 #ifndef CONFIG_DMABUF_PARTIAL
316
321
 	if (args.flags & RKNPU_MEM_SYNC_TO_DEVICE) {
..
..
@@ -322,6 +327,7 @@
322
327
 				   DMA_FROM_DEVICE, true);
323
328
 	}
324
329
 #else
330
+	dmabuf = rknpu_obj->dmabuf;
325
331
 	if (args.flags & RKNPU_MEM_SYNC_TO_DEVICE) {
326
332
 		dmabuf->ops->end_cpu_access_partial(dmabuf, DMA_TO_DEVICE,
327
333
 						    args.offset, args.size);
..
..
@@ -334,3 +340,5 @@
334
340
 
335
341
 	return 0;
336
342
 }
343
+
344
+#endif