forked from clearlinux-pkgs/linux-iot-lts2018
-
Notifications
You must be signed in to change notification settings - Fork 0
/
0065-media-intel-ipu4-VIRT-Add-multi-streaming-su.patch
2607 lines (2362 loc) · 75 KB
/
0065-media-intel-ipu4-VIRT-Add-multi-streaming-su.patch
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
From 0a5399baeb5e3733ca832c1db1e2fb10bdbfa02d Mon Sep 17 00:00:00 2001
From: Ong Hock Yu <[email protected]>
Date: Tue, 2 Oct 2018 08:50:23 +0800
Subject: [PATCH 22/25] media: intel-ipu4: [VIRT] Add multi streaming support
on guest OS
Change-Id: I416c99a032e9f2a9611c43ca917b28e3ff70fe18
Signed-off-by: Ong Hock Yu <[email protected]>
---
.../media/pci/intel/ici/ici-isys-frame-buf.c | 12 +-
drivers/media/pci/intel/ici/ici-isys-stream.h | 1 -
drivers/media/pci/intel/virtio/Makefile.virt | 2 +
.../intel/virtio/intel-ipu4-para-virt-drv.c | 199 +++++-----------
.../intel/virtio/intel-ipu4-para-virt-drv.h | 4 -
.../virtio/intel-ipu4-virtio-be-bridge.c | 179 +++++++--------
.../virtio/intel-ipu4-virtio-be-bridge.h | 5 +-
.../virtio/intel-ipu4-virtio-be-pipeline.c | 203 +++++++++++++---
.../virtio/intel-ipu4-virtio-be-pipeline.h | 20 +-
.../intel-ipu4-virtio-be-request-queue.c | 57 +++++
.../intel-ipu4-virtio-be-request-queue.h | 27 +++
.../virtio/intel-ipu4-virtio-be-stream.c | 216 +++++++++++++-----
.../virtio/intel-ipu4-virtio-be-stream.h | 20 +-
.../pci/intel/virtio/intel-ipu4-virtio-be.c | 152 ++++++------
.../pci/intel/virtio/intel-ipu4-virtio-be.h | 12 +-
.../intel/virtio/intel-ipu4-virtio-common.c | 77 +++++++
.../intel/virtio/intel-ipu4-virtio-common.h | 45 +++-
.../virtio/intel-ipu4-virtio-fe-pipeline.c | 7 +-
.../intel-ipu4-virtio-fe-request-queue.c | 72 ++++++
.../intel-ipu4-virtio-fe-request-queue.h | 14 ++
.../pci/intel/virtio/intel-ipu4-virtio-fe.c | 65 ++++--
21 files changed, 914 insertions(+), 475 deletions(-)
create mode 100644 drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-request-queue.c
create mode 100644 drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-request-queue.h
create mode 100644 drivers/media/pci/intel/virtio/intel-ipu4-virtio-fe-request-queue.c
create mode 100644 drivers/media/pci/intel/virtio/intel-ipu4-virtio-fe-request-queue.h
diff --git a/drivers/media/pci/intel/ici/ici-isys-frame-buf.c b/drivers/media/pci/intel/ici/ici-isys-frame-buf.c
index 8e62c273b35a..bd99ba14a8af 100644
--- a/drivers/media/pci/intel/ici/ici-isys-frame-buf.c
+++ b/drivers/media/pci/intel/ici/ici-isys-frame-buf.c
@@ -495,6 +495,9 @@ int ici_isys_get_buf_virt(struct ici_isys_stream *as,
return 0;
}
+ pr_debug("%s: creating new buf object\n", __func__);
+ pr_debug("%s: mem.userptr %lu", __func__,
+ frame_buf->frame_info.frame_planes[0].mem.userptr);
buf = frame_buf;
@@ -585,6 +588,8 @@ static void frame_buf_done(
list_add_tail(&buf->node, &buf_list->putbuf_list);
spin_unlock_irqrestore(&buf_list->lock, flags);
wake_up_interruptible(&buf_list->wait);
+ pr_debug("%s: Frame data arrived! %lu", __func__,
+ buf->frame_info.frame_planes[0].mem.userptr);
}
void ici_isys_frame_buf_ready(struct ici_isys_pipeline
@@ -639,8 +644,6 @@ void ici_isys_frame_buf_ready(struct ici_isys_pipeline
} else {
buf->frame_info.field = ICI_FIELD_NONE;
frame_buf_done(buf_list, buf);
- if (as->frame_done_notify_queue)
- as->frame_done_notify_queue();
}
dev_dbg(&isys->adev->dev, "buffer: found buffer %p\n", buf);
@@ -720,6 +723,9 @@ int ici_isys_frame_buf_add_next(
buf->state = ICI_BUF_ACTIVE;
mutex_unlock(&buf_list->mutex);
+ pr_debug("%s: add buf to FW! %lu", __func__,
+ buf->frame_info.frame_planes[0].mem.userptr);
+
css_buf->send_irq_sof = 1;
css_buf->output_pins[buf_list->fw_output].addr =
(uint32_t)buf->kframe_info.planes[0].dma_addr;
@@ -797,8 +803,6 @@ void ici_isys_frame_buf_capture_done(
buf->frame_info.field = ip->cur_field;
list_del(&buf->node);
frame_buf_done(buf_list, buf);
- if (as->frame_done_notify_queue)
- as->frame_done_notify_queue();
}
}
}
diff --git a/drivers/media/pci/intel/ici/ici-isys-stream.h b/drivers/media/pci/intel/ici/ici-isys-stream.h
index 77d89ed2ea79..457b123a65db 100644
--- a/drivers/media/pci/intel/ici/ici-isys-stream.h
+++ b/drivers/media/pci/intel/ici/ici-isys-stream.h
@@ -50,7 +50,6 @@ struct ici_isys_stream {
void (*prepare_firmware_stream_cfg)(
struct ici_isys_stream *as,
struct ia_css_isys_stream_cfg_data *cfg);
- int (*frame_done_notify_queue)(void);
};
#define to_intel_ipu4_isys_ici_stream(__buf_list) \
diff --git a/drivers/media/pci/intel/virtio/Makefile.virt b/drivers/media/pci/intel/virtio/Makefile.virt
index c3c30c4bf921..75f481b3b71d 100644
--- a/drivers/media/pci/intel/virtio/Makefile.virt
+++ b/drivers/media/pci/intel/virtio/Makefile.virt
@@ -8,11 +8,13 @@ $(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-common.o
ifdef CONFIG_VIDEO_INTEL_IPU_VIRTIO_BE
+ $(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-be-request-queue.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-be-pipeline.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-be-bridge.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-be.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-be-stream.o
else
+ $(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-fe-request-queue.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-fe-pipeline.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-fe-payload.o
$(TARGET_MODULE)-objs += ../virtio/intel-ipu4-virtio-fe.o
diff --git a/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.c b/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.c
index 3f6d541c87fe..23275846e198 100644
--- a/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.c
+++ b/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.c
@@ -18,6 +18,7 @@
#include "intel-ipu4-para-virt-drv.h"
#include "intel-ipu4-virtio-fe-pipeline.h"
#include "intel-ipu4-virtio-fe-payload.h"
+#include "intel-ipu4-virtio-fe-request-queue.h"
#include "./ici/ici-isys-stream.h"
#include "./ici/ici-isys-pipeline-device.h"
@@ -33,8 +34,6 @@ static int stream_dev_init;
static struct ipu4_virtio_ctx *g_fe_priv;
-struct mutex fop_mutex;
-
#ifdef CONFIG_COMPAT
struct timeval32 {
__u32 tv_sec;
@@ -219,63 +218,6 @@ static struct ici_frame_buf_wrapper *frame_buf_lookup(struct ici_isys_frame_buf_
}
return NULL;
}
-static void put_userpages(struct ici_kframe_plane *kframe_plane)
-{
- struct sg_table *sgt = kframe_plane->sgt;
- struct scatterlist *sgl;
- unsigned int i;
- struct mm_struct *mm = current->active_mm;
-
- if (!mm) {
- pr_err("Failed to get active mm_struct ptr from current process.\n");
- return;
- }
-
- down_read(&mm->mmap_sem);
- for_each_sg(sgt->sgl, sgl, sgt->orig_nents, i) {
- struct page *page = sg_page(sgl);
-
- unsigned int npages = PAGE_ALIGN(sgl->offset + sgl->length) >> PAGE_SHIFT;
- unsigned int page_no;
-
- for (page_no = 0; page_no < npages; ++page_no, ++page) {
- set_page_dirty_lock(page);
- put_page(page);
- }
- }
-
- kfree(sgt);
- kframe_plane->sgt = NULL;
-
- up_read(&mm->mmap_sem);
-}
-
-static void put_dma(struct ici_kframe_plane *kframe_plane)
-{
- struct sg_table *sgt = kframe_plane->sgt;
-
- if (WARN_ON(!kframe_plane->db_attach)) {
- pr_err("trying to unpin a not attached buffer\n");
- return;
- }
-
- if (WARN_ON(!sgt)) {
- pr_err("dmabuf buffer is already unpinned\n");
- return;
- }
-
- if (kframe_plane->kaddr) {
- dma_buf_vunmap(kframe_plane->db_attach->dmabuf,
- kframe_plane->kaddr);
- kframe_plane->kaddr = NULL;
- }
- dma_buf_unmap_attachment(kframe_plane->db_attach, sgt,
- DMA_BIDIRECTIONAL);
-
- kframe_plane->dma_addr = 0;
- kframe_plane->sgt = NULL;
-
-}
static int map_dma(struct device *dev, struct ici_frame_plane *frame_plane,
struct ici_kframe_plane *kframe_plane)
@@ -332,26 +274,6 @@ static int map_dma(struct device *dev, struct ici_frame_plane *frame_plane,
return ret;
}
-static void unmap_buf(struct ici_frame_buf_wrapper *buf)
-{
- int i;
-
- for (i = 0; i < buf->frame_info.num_planes; i++) {
- struct ici_kframe_plane *kframe_plane =
- &buf->kframe_info.planes[i];
- switch (kframe_plane->mem_type) {
- case ICI_MEM_USERPTR:
- put_userpages(kframe_plane);
- break;
- case ICI_MEM_DMABUF:
- put_dma(kframe_plane);
- break;
- default:
- pr_debug("not supported memory type: %d\n", kframe_plane->mem_type);
- break;
- }
- }
-}
struct ici_frame_buf_wrapper *get_buf(struct virtual_stream *vstream, struct ici_frame_info *frame_info)
{
int res;
@@ -450,7 +372,7 @@ static int virt_isys_set_format(struct file *file, void *fh,
pr_debug("Calling Set Format\n");
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
op[0] = vstream->virt_dev_id;
@@ -463,10 +385,10 @@ static int virt_isys_set_format(struct file *file, void *fh,
rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_0);
if (rval) {
dev_err(&strm_dev->dev, "Failed to open virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
@@ -480,7 +402,8 @@ static int virt_isys_stream_on(struct file *file, void *fh)
int rval = 0;
int op[10];
pr_debug("Calling Stream ON\n");
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
op[0] = vstream->virt_dev_id;
@@ -491,14 +414,10 @@ static int virt_isys_stream_on(struct file *file, void *fh)
rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_0);
if (rval) {
dev_err(&strm_dev->dev, "Failed to open virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
-
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
- if (!req && !fe_ctx)
- return -ENOMEM;
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
@@ -513,7 +432,7 @@ static int virt_isys_stream_off(struct file *file, void *fh)
int op[10];
pr_debug("Calling Stream OFF\n");
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
op[0] = vstream->virt_dev_id;
@@ -524,10 +443,10 @@ static int virt_isys_stream_off(struct file *file, void *fh)
rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_0);
if (rval) {
dev_err(&strm_dev->dev, "Failed to open virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
buf_stream_cancel(vstream);
@@ -545,7 +464,7 @@ static int virt_isys_getbuf(struct file *file, void *fh,
int rval = 0;
int op[3];
- pr_debug("Calling Get Buffer\n");
+ pr_debug("%s stream %d", __func__, vstream->virt_dev_id);
buf = get_buf(vstream, user_frame_info);
if (!buf) {
@@ -553,7 +472,7 @@ static int virt_isys_getbuf(struct file *file, void *fh,
return -ENOMEM;
}
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
@@ -567,10 +486,12 @@ static int virt_isys_getbuf(struct file *file, void *fh,
rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_0);
if (rval) {
dev_err(&strm_dev->dev, "Failed to Get Buffer\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
+
+ pr_debug("%s exit stream %d", __func__, vstream->virt_dev_id);
return rval;
}
@@ -585,9 +506,9 @@ static int virt_isys_putbuf(struct file *file, void *fh,
int rval = 0;
int op[2];
- pr_debug("Calling Put Buffer\n");
+ pr_debug("%s stream %d", __func__, vstream->virt_dev_id);
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
@@ -600,14 +521,12 @@ static int virt_isys_putbuf(struct file *file, void *fh,
rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_0);
if (rval) {
dev_err(&strm_dev->dev, "Failed to Get Buffer\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
- if (!req && !fe_ctx)
- return -ENOMEM;
+ pr_debug("%s exit stream %d", __func__, vstream->virt_dev_id);
return rval;
}
@@ -624,7 +543,7 @@ static unsigned int stream_fop_poll(struct file *file, struct ici_stream_device
dev_dbg(&strm_dev->dev, "stream_fop_poll %d\n", vstream->virt_dev_id);
get_device(&dev->dev);
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
@@ -633,22 +552,16 @@ static unsigned int stream_fop_poll(struct file *file, struct ici_stream_device
intel_ipu4_virtio_create_req(req, IPU4_CMD_POLL, &op[0]);
- mutex_lock(&fop_mutex);
-
- rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_1);
+ rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true,
+ IPU_VIRTIO_QUEUE_0);
if (rval) {
- mutex_unlock(&fop_mutex);
dev_err(&strm_dev->dev, "Failed to open virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
+ ipu4_virtio_fe_req_queue_put(req);
- mutex_unlock(&fop_mutex);
-
- rval = req->func_ret;
- kfree(req);
-
- return rval;
+ return req->func_ret;
}
static int virt_stream_fop_open(struct inode *inode, struct file *file)
@@ -667,7 +580,7 @@ static int virt_stream_fop_open(struct inode *inode, struct file *file)
if (!fe_ctx)
return -EINVAL;
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req) {
dev_err(&strm_dev->dev, "Virtio Req buffer failed\n");
return -ENOMEM;
@@ -678,18 +591,14 @@ static int virt_stream_fop_open(struct inode *inode, struct file *file)
intel_ipu4_virtio_create_req(req, IPU4_CMD_DEVICE_OPEN, &op[0]);
- mutex_lock(&fop_mutex);
-
- rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_1);
+ rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true,
+ IPU_VIRTIO_QUEUE_0);
if (rval) {
- mutex_unlock(&fop_mutex);
dev_err(&strm_dev->dev, "Failed to open virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
-
- mutex_unlock(&fop_mutex);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
@@ -705,7 +614,7 @@ static int virt_stream_fop_release(struct inode *inode, struct file *file)
pr_debug("%s %d", __func__, vstream->virt_dev_id);
put_device(&strm_dev->dev);
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
@@ -714,18 +623,14 @@ static int virt_stream_fop_release(struct inode *inode, struct file *file)
intel_ipu4_virtio_create_req(req, IPU4_CMD_DEVICE_CLOSE, &op[0]);
- mutex_lock(&fop_mutex);
-
- rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true, IPU_VIRTIO_QUEUE_1);
+ rval = fe_ctx->bknd_ops->send_req(fe_ctx->domid, req, true,
+ IPU_VIRTIO_QUEUE_0);
if (rval) {
- mutex_unlock(&fop_mutex);
dev_err(&strm_dev->dev, "Failed to close virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
-
- mutex_unlock(&fop_mutex);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
@@ -740,10 +645,7 @@ static unsigned int virt_stream_fop_poll(struct file *file,
res = stream_fop_poll(file, as);
- //res = POLLIN;
-
dev_dbg(&as->dev, "virt_stream_fop_poll res %u\n", res);
-
return res;
}
@@ -1014,7 +916,7 @@ static int virt_pipeline_fop_open(struct inode *inode, struct file *file)
file->private_data = dev;
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
@@ -1023,14 +925,14 @@ static int virt_pipeline_fop_open(struct inode *inode, struct file *file)
intel_ipu4_virtio_create_req(req, IPU4_CMD_PIPELINE_OPEN, &op[0]);
- rval = g_fe_priv->bknd_ops->send_req(g_fe_priv->domid, req, true, IPU_VIRTIO_QUEUE_1);
+ rval = g_fe_priv->bknd_ops->send_req(g_fe_priv->domid, req, true,
+ IPU_VIRTIO_QUEUE_0);
if (rval) {
pr_err("Failed to open virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
-
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
@@ -1045,7 +947,7 @@ static int virt_pipeline_fop_release(struct inode *inode, struct file *file)
put_device(&pipe_dev->dev);
- req = kcalloc(1, sizeof(*req), GFP_KERNEL);
+ req = ipu4_virtio_fe_req_queue_get();
if (!req)
return -ENOMEM;
@@ -1054,13 +956,13 @@ static int virt_pipeline_fop_release(struct inode *inode, struct file *file)
intel_ipu4_virtio_create_req(req, IPU4_CMD_PIPELINE_CLOSE, &op[0]);
- rval = g_fe_priv->bknd_ops->send_req(g_fe_priv->domid, req, true, IPU_VIRTIO_QUEUE_1);
+ rval = g_fe_priv->bknd_ops->send_req(g_fe_priv->domid, req, true, IPU_VIRTIO_QUEUE_0);
if (rval) {
pr_err("Failed to close virtual device\n");
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
- kfree(req);
+ ipu4_virtio_fe_req_queue_put(req);
return rval;
}
@@ -1271,7 +1173,6 @@ static int __init virt_ici_init(void)
if (!vstream)
return -ENOMEM;
mutex_init(&vstream->mutex);
- mutex_init(&fop_mutex);
vstream->strm_dev.mutex = &vstream->mutex;
rval = virt_frame_buf_init(&vstream->buf_list);
@@ -1288,6 +1189,10 @@ static int __init virt_ici_init(void)
goto init_fail;
}
+ rval = ipu4_virtio_fe_req_queue_init();
+ if (rval)
+ goto init_fail;
+
rval = virt_ici_pipeline_init();
if (rval)
goto init_fail;
@@ -1297,7 +1202,6 @@ static int __init virt_ici_init(void)
init_fail:
mutex_destroy(&vstream->mutex);
- mutex_destroy(&fop_mutex);
kfree(vstream);
return rval;
}
@@ -1318,6 +1222,7 @@ static void __exit virt_ici_exit(void)
{
virt_ici_stream_exit();
virt_ici_pipeline_exit();
+ ipu4_virtio_fe_req_queue_free();
}
module_init(virt_ici_init);
diff --git a/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.h b/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.h
index f44954b03be2..d6d9210d937a 100644
--- a/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.h
+++ b/drivers/media/pci/intel/virtio/intel-ipu4-para-virt-drv.h
@@ -18,10 +18,6 @@
#include "./ici/ici-isys-frame-buf.h"
#include "intel-ipu4-virtio-common.h"
-#define MAX_STREAM_DEVICES 64
-#define MAX_PIPELINE_DEVICES 1
-#define MAX_ISYS_VIRT_STREAM 34
-
struct virtual_stream {
struct mutex mutex;
struct ici_stream_device strm_dev;
diff --git a/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.c b/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.c
index b88fe6d75bc2..3b5eae651026 100644
--- a/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.c
+++ b/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.c
@@ -10,15 +10,18 @@
#include <linux/miscdevice.h>
#include <linux/fs.h>
#include <linux/syscalls.h>
+#include <linux/kthread.h>
#include "intel-ipu4-virtio-be-bridge.h"
#include "./ici/ici-isys-frame-buf.h"
#include "intel-ipu4-virtio-be-pipeline.h"
#include "intel-ipu4-virtio-be-stream.h"
-int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
+int intel_ipu4_virtio_msg_parse(struct ipu4_virtio_req_info *req_info)
{
int ret = 0;
+ struct ipu4_virtio_req *req = req_info->request;
+
if (!req) {
pr_err("IPU mediator: request is NULL\n");
return -EINVAL;
@@ -28,6 +31,10 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
pr_err("IPU mediator: invalid command\n");
return -EINVAL;
}
+
+ if (!req_info)
+ return -1;
+
switch (req->cmd) {
case IPU4_CMD_POLL:
/*
@@ -35,9 +42,11 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op0 - virtual device node number
* op1 - Actual device fd. By default set to 0
*/
- pr_debug("%s: process_poll pre", __func__);
- req->stat = process_poll(domid, req);
- pr_debug("%s: process_poll post", __func__);
+ pr_debug("%s: process_poll %d",
+ __func__, req->op[0]);
+ kthread_run(process_poll_thread, req_info,
+ "process_poll");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_DEVICE_OPEN:
/*
@@ -46,11 +55,9 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op1 - Actual device fd. By default set to 0
*/
pr_debug("DEVICE_OPEN: virtual_dev_id:%d actual_fd:%d\n", req->op[0], req->op[1]);
- ret = process_device_open(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ kthread_run(process_device_open_thread, req_info,
+ "process_device_open");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_DEVICE_CLOSE:
/*
@@ -59,11 +66,9 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op1 - Actual device fd. By default set to 0
*/
pr_debug("DEVICE_CLOSE: virtual_dev_id:%d actual_fd:%d\n", req->op[0], req->op[1]);
- ret = process_device_close(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ kthread_run(process_device_close_thread, req_info,
+ "process_device_close");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_STREAM_ON:
/* Start Stream
@@ -71,11 +76,9 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op1 - Actual device fd. By default set to 0
*/
pr_debug("STREAM ON: virtual_dev_id:%d actual_fd:%d\n", req->op[0], req->op[1]);
- ret = process_stream_on(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ kthread_run(process_stream_on_thread, req_info,
+ "process_stream_on");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_STREAM_OFF:
/* Stop Stream
@@ -83,11 +86,9 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op1 - Actual device fd. By default set to 0
*/
pr_debug("STREAM OFF: virtual_dev_id:%d actual_fd:%d\n", req->op[0], req->op[1]);
- ret = process_stream_off(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ kthread_run(process_stream_off_thread, req_info,
+ "process_stream_off");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_GET_BUF:
/* Set Format of a given video node
@@ -99,11 +100,11 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op5 - Length of Buffer
*/
- ret = process_get_buf(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_get_buf %d",
+ __func__, req->op[0]);
+ kthread_run(process_get_buf_thread, req_info,
+ "process_get_buf");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_PUT_BUF:
/* Set Format of a given video node
@@ -111,88 +112,88 @@ int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req)
* op1 - Actual device fd. By default set to 0
* op2 - Memory Type 1: USER_PTR 2: DMA_PTR
*/
- ret = process_put_buf(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_put_buf %d",
+ __func__, req->op[0]);
+ kthread_run(process_put_buf_thread, req_info,
+ "process_put_buf");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_SET_FORMAT:
- ret = process_set_format(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_set_format %d",
+ __func__, req->op[0]);
+ kthread_run(process_set_format_thread, req_info,
+ "process_set_format");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_PIPELINE_OPEN:
- ret = process_pipeline_open(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_pipeline_open %d",
+ __func__, req->op[0]);
+ kthread_run(process_pipeline_open_thread, req_info,
+ "process_pipeline_open");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_PIPELINE_CLOSE:
- ret = process_pipeline_close(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_pipeline_close %d",
+ __func__, req->op[0]);
+ kthread_run(process_pipeline_close_thread, req_info,
+ "process_pipeline_close");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_ENUM_NODES:
- ret = process_enum_nodes(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_enum_nodes %d",
+ __func__, req->op[0]);
+ kthread_run(process_enum_nodes_thread, req_info,
+ "process_enum_nodes");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_ENUM_LINKS:
- ret = process_enum_links(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_enum_links %d",
+ __func__, req->op[0]);
+ kthread_run(process_enum_links_thread, req_info,
+ "process_enum_links");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_SETUP_PIPE:
- ret = process_setup_pipe(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_setup_pipe %d",
+ __func__, req->op[0]);
+ kthread_run(process_setup_pipe_thread, req_info,
+ "process_setup_pipe");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_SET_FRAMEFMT:
- ret = process_set_framefmt(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_set_framefmt %d",
+ __func__, req->op[0]);
+ kthread_run(process_set_framefmt_thread, req_info,
+ "process_set_framefmt");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_GET_FRAMEFMT:
- ret = process_get_framefmt(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_get_framefmt %d",
+ __func__, req->op[0]);
+ kthread_run(process_get_framefmt_thread, req_info,
+ "process_get_framefmt");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_GET_SUPPORTED_FRAMEFMT:
- ret = process_get_supported_framefmt(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_get_supported_framefmt %d",
+ __func__, req->op[0]);
+ kthread_run(process_get_supported_framefmt_thread,
+ req_info, "process_get_supported_framefmt");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_SET_SELECTION:
- ret = process_pad_set_sel(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_pad_set_sel %d",
+ __func__, req->op[0]);
+ kthread_run(process_pad_set_sel_thread, req_info,
+ "process_pad_set_sel");
+ req->stat = IPU4_REQ_PENDING;
break;
case IPU4_CMD_GET_SELECTION:
- ret = process_pad_get_sel(domid, req);
- if (ret)
- req->stat = IPU4_REQ_ERROR;
- else
- req->stat = IPU4_REQ_PROCESSED;
+ pr_debug("%s process_pad_get_sel %d",
+ __func__, req->op[0]);
+ kthread_run(process_pad_get_sel_thread, req_info,
+ "process_pad_get_sel");
+ req->stat = IPU4_REQ_PENDING;
break;
default:
return -EINVAL;
diff --git a/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.h b/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.h
index 25238f29bc33..18085882de85 100644
--- a/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.h
+++ b/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-bridge.h
@@ -12,14 +12,13 @@
#include <linux/vhm/acrn_vhm_mm.h>
#include "intel-ipu4-virtio-common.h"
+#include "intel-ipu4-virtio-be-request-queue.h"
-int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req);
+int intel_ipu4_virtio_msg_parse(struct ipu4_virtio_req_info *req_info);
void intel_ipu4_virtio_create_req(struct ipu4_virtio_req *req,
enum intel_ipu4_virtio_command cmd, int *op);
-int intel_ipu4_virtio_msg_parse(int domid, struct ipu4_virtio_req *req);
-
#endif
diff --git a/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-pipeline.c b/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-pipeline.c
index 3adf5b4c9640..086421151f28 100644
--- a/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-pipeline.c
+++ b/drivers/media/pci/intel/virtio/intel-ipu4-virtio-be-pipeline.c
@@ -14,176 +14,321 @@
#include "intel-ipu4-virtio-be-pipeline.h"
#include "./ici/ici-isys-pipeline.h"
#include "./ici/ici-isys-pipeline-device.h"
+#include "intel-ipu4-virtio-be.h"
+#include "intel-ipu4-virtio-be-request-queue.h"
static struct file *pipeline;
static int guestID = -1;
-int process_pipeline_open(int domid, struct ipu4_virtio_req *req)
+int process_pipeline_open(struct ipu4_virtio_req_info *req_info)
{
+ int domid = req_info->domid;
if (guestID != -1 && guestID != domid) {
pr_err("%s: pipeline device already opened by other guest! %d %d", __func__, guestID, domid);
- return -1;
+ return IPU4_REQ_ERROR;
}
pr_info("process_device_open: /dev/intel_pipeline");
pipeline = filp_open("/dev/intel_pipeline", O_RDWR | O_NONBLOCK, 0);
guestID = domid;
- return 0;
+ return IPU4_REQ_PROCESSED;
}
-int process_pipeline_close(int domid, struct ipu4_virtio_req *req)
+int process_pipeline_close(struct ipu4_virtio_req_info *req_info)
{
+ struct ipu4_virtio_req *req = req_info->request;
+
pr_info("%s: %d", __func__, req->op[0]);
filp_close(pipeline, 0);
guestID = -1;
- return 0;
+ return IPU4_REQ_PROCESSED;
}
-int process_enum_nodes(int domid, struct ipu4_virtio_req *req)
+int process_enum_nodes(struct ipu4_virtio_req_info *req_info)
{
int err = 0;
struct ici_isys_pipeline_device *dev = pipeline->private_data;
struct ici_node_desc *host_virt;
+ struct ipu4_virtio_req *req = req_info->request;
+ int domid = req_info->domid;
pr_debug("%s\n", __func__);
host_virt = (struct ici_node_desc *)map_guest_phys(domid, req->payload, PAGE_SIZE);
if (host_virt == NULL) {
pr_err("process_enum_nodes: NULL host_virt");
- return 0;
+ return IPU4_REQ_ERROR;
}
err = dev->pipeline_ioctl_ops->pipeline_enum_nodes(pipeline, dev, host_virt);
- return err;
+ if (err)
+ return IPU4_REQ_ERROR;
+ else
+ return IPU4_REQ_PROCESSED;
}
-int process_enum_links(int domid, struct ipu4_virtio_req *req)
+int process_enum_links(struct ipu4_virtio_req_info *req_info)
{
int err = 0;
struct ici_isys_pipeline_device *dev = pipeline->private_data;
struct ici_links_query *host_virt;
+ struct ipu4_virtio_req *req = req_info->request;
+ int domid = req_info->domid;
pr_debug("%s\n", __func__);
host_virt = (struct ici_links_query *)map_guest_phys(domid, req->payload, PAGE_SIZE);
if (host_virt == NULL) {
pr_err("%s: NULL host_virt\n", __func__);
- return 0;
+ return IPU4_REQ_ERROR;
}
err = dev->pipeline_ioctl_ops->pipeline_enum_links(pipeline, dev, host_virt);
- return err;
+ if (err)
+ return IPU4_REQ_ERROR;
+ else
+ return IPU4_REQ_PROCESSED;
}
-int process_get_supported_framefmt(int domid, struct ipu4_virtio_req *req)
+int process_get_supported_framefmt(struct ipu4_virtio_req_info *req_info)
{
int err = 0;
struct ici_isys_pipeline_device *dev = pipeline->private_data;
struct ici_pad_supported_format_desc *host_virt;
+ struct ipu4_virtio_req *req = req_info->request;
+ int domid = req_info->domid;
pr_debug("%s\n", __func__);
host_virt = (struct ici_pad_supported_format_desc *)map_guest_phys(domid, req->payload, PAGE_SIZE);
if (host_virt == NULL) {
pr_err("%s: NULL host_virt\n", __func__);
- return 0;
+ return IPU4_REQ_ERROR;
}
err = dev->pipeline_ioctl_ops->pad_get_supported_format(pipeline, dev, host_virt);
- return err;
+ if (err)
+ return IPU4_REQ_ERROR;
+ else
+ return IPU4_REQ_PROCESSED;
}