-
Notifications
You must be signed in to change notification settings - Fork 2
/
Copy pathseabios-Revert-Support-for-booting-from-virtio-disks.patch
838 lines (829 loc) · 22.7 KB
/
seabios-Revert-Support-for-booting-from-virtio-disks.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
From f9c13daf0ef68df0b6ebcf365138b778fc6b1c38 Mon Sep 17 00:00:00 2001
From: Eduardo Habkost <[email protected]>
Date: Fri, 28 May 2010 20:16:08 -0300
Subject: [PATCH] Revert "Support for booting from virtio disks"
RH-Reverts: d3ddd70a36cf218acb06045515ce299d67bae08c
RH-Reverts-patchwork-id: 9180
Bugzilla-related: 578752
Bugzilla: 596881
Signed-off-by: Eduardo Habkost <[email protected]>
---
Makefile | 3 +-
src/block.c | 6 --
src/config.h | 3 -
src/disk.h | 1 -
src/pci_ids.h | 3 -
src/post.c | 2 -
src/virtio-blk.c | 170 -----------------------------------------------------
src/virtio-blk.h | 44 --------------
src/virtio-pci.c | 69 ---------------------
src/virtio-pci.h | 100 -------------------------------
src/virtio-ring.c | 154 ------------------------------------------------
src/virtio-ring.h | 129 ----------------------------------------
12 files changed, 1 insertions(+), 683 deletions(-)
delete mode 100644 src/virtio-blk.c
delete mode 100644 src/virtio-blk.h
delete mode 100644 src/virtio-pci.c
delete mode 100644 src/virtio-pci.h
delete mode 100644 src/virtio-ring.c
delete mode 100644 src/virtio-ring.h
diff --git a/Makefile b/Makefile
index ccf41af..c33647e 100644
--- a/Makefile
+++ b/Makefile
@@ -14,8 +14,7 @@ OUT=out/
SRCBOTH=misc.c pmm.c stacks.c output.c util.c block.c floppy.c ata.c mouse.c \
kbd.c pci.c serial.c clock.c pic.c cdrom.c ps2port.c smp.c resume.c \
pnpbios.c pirtable.c vgahooks.c ramdisk.c pcibios.c \
- usb.c usb-uhci.c usb-ohci.c usb-hid.c paravirt.c \
- virtio-ring.c virtio-pci.c virtio-blk.c
+ usb.c usb-uhci.c usb-ohci.c usb-hid.c paravirt.c
SRC16=$(SRCBOTH) system.c disk.c apm.c font.c
SRC32FLAT=$(SRCBOTH) post.c shadow.c memmap.c coreboot.c boot.c \
acpi.c smm.c mptable.c smbios.c pciinit.c optionroms.c mtrr.c \
diff --git a/src/block.c b/src/block.c
index 0ef1c9a..01aa84a 100644
--- a/src/block.c
+++ b/src/block.c
@@ -10,7 +10,6 @@
#include "cmos.h" // inb_cmos
#include "util.h" // dprintf
#include "ata.h" // process_ata_op
-#include "virtio-blk.h" // process_virtio_op
struct drives_s Drives VAR16VISIBLE;
@@ -298,9 +297,6 @@ describe_drive(struct drive_s *drive_g)
case DTYPE_RAMDISK:
describe_ramdisk(drive_g);
break;
- case DTYPE_VIRTIO:
- describe_virtio(drive_g);
- break;
default:
printf("Unknown");
break;
@@ -328,8 +324,6 @@ process_op(struct disk_op_s *op)
return process_ramdisk_op(op);
case DTYPE_CDEMU:
return process_cdemu_op(op);
- case DTYPE_VIRTIO:
- return process_virtio_op(op);
default:
op->count = 0;
return DISK_RET_EPARAM;
diff --git a/src/config.h b/src/config.h
index 1f6a563..afa0612 100644
--- a/src/config.h
+++ b/src/config.h
@@ -131,9 +131,6 @@
#define CONFIG_SUBMODEL_ID 0x00
#define CONFIG_BIOS_REVISION 0x01
-// Support boot from virtio storage
-#define CONFIG_VIRTIO_BLK 1
-
// Various memory addresses used by the code.
#define BUILD_STACK_ADDR 0x7000
#define BUILD_S3RESUME_STACK_ADDR 0x1000
diff --git a/src/disk.h b/src/disk.h
index 749fedb..ac5748e 100644
--- a/src/disk.h
+++ b/src/disk.h
@@ -198,7 +198,6 @@ struct drive_s {
#define DTYPE_ATAPI 0x03
#define DTYPE_RAMDISK 0x04
#define DTYPE_CDEMU 0x05
-#define DTYPE_VIRTIO 0x07
#define TRANSLATION_NONE 0
#define TRANSLATION_LBA 1
diff --git a/src/pci_ids.h b/src/pci_ids.h
index e1cded2..1800f1d 100644
--- a/src/pci_ids.h
+++ b/src/pci_ids.h
@@ -2605,6 +2605,3 @@
#define PCI_DEVICE_ID_RME_DIGI32 0x9896
#define PCI_DEVICE_ID_RME_DIGI32_PRO 0x9897
#define PCI_DEVICE_ID_RME_DIGI32_8 0x9898
-
-#define PCI_VENDOR_ID_REDHAT_QUMRANET 0x1af4
-#define PCI_DEVICE_ID_VIRTIO_BLK 0x1001
diff --git a/src/post.c b/src/post.c
index ec9d21f..fb3b37f 100644
--- a/src/post.c
+++ b/src/post.c
@@ -23,7 +23,6 @@
#include "smbios.h" // smbios_init
#include "paravirt.h" // qemu_cfg_port_probe
#include "ps2port.h" // ps2port_setup
-#include "virtio-blk.h" // virtio_blk_setup
void
__set_irq(int vector, void *loc)
@@ -213,7 +212,6 @@ post(void)
floppy_setup();
ata_setup();
ramdisk_setup();
- virtio_blk_setup();
// Run option roms
if (CONFIG_THREADS && CONFIG_THREAD_OPTIONROMS) {
diff --git a/src/virtio-blk.c b/src/virtio-blk.c
deleted file mode 100644
index 14719c9..0000000
--- a/src/virtio-blk.c
+++ /dev/null
@@ -1,170 +0,0 @@
-// Virtio block boot support.
-//
-// Copyright (C) 2010 Red Hat Inc.
-//
-// Authors:
-// Gleb Natapov <[email protected]>
-//
-// This file may be distributed under the terms of the GNU LGPLv3 license.
-
-#include "util.h" // dprintf
-#include "pci.h" // foreachpci
-#include "config.h" // CONFIG_*
-#include "biosvar.h" // GET_GLOBAL
-#include "pci_ids.h" // PCI_DEVICE_ID_VIRTIO_BLK
-#include "pci_regs.h" // PCI_VENDOR_ID
-#include "boot.h" // add_bcv_internal
-#include "virtio-pci.h"
-#include "virtio-ring.h"
-#include "virtio-blk.h"
-#include "disk.h"
-
-struct virtiodrive_s {
- struct vring_virtqueue *vq;
- u16 ioaddr;
-};
-
-static int
-virtio_blk_read(struct disk_op_s *op)
-{
- struct drive_s *drive_g = op->drive_g;
- struct virtiodrive_s *vdrive_g = (void*)GET_GLOBAL(drive_g->cntl_info);
- struct vring_virtqueue *vq = GET_FLATPTR(vdrive_g->vq);
- struct virtio_blk_outhdr hdr = {
- .type = VIRTIO_BLK_T_IN,
- .ioprio = 0,
- .sector = op->lba,
- };
- u8 status = VIRTIO_BLK_S_UNSUPP;
- struct vring_list sg[] = {
- {
- .addr = MAKE_FLATPTR(GET_SEG(SS), &hdr),
- .length = sizeof(hdr),
- },
- {
- .addr = op->buf_fl,
- .length = GET_GLOBAL(drive_g->blksize) * op->count,
- },
- {
- .addr = MAKE_FLATPTR(GET_SEG(SS), &status),
- .length = sizeof(status),
- },
- };
-
- /* Add to virtqueue and kick host */
- vring_add_buf(vq, sg, 1, 2, 0, 0);
- vring_kick(GET_FLATPTR(vdrive_g->ioaddr), vq, 1);
-
- /* Wait for reply */
- while (!vring_more_used(vq))
- udelay(5);
-
- /* Reclaim virtqueue element */
- vring_get_buf(vq, NULL);
- return status == VIRTIO_BLK_S_OK ? DISK_RET_SUCCESS : DISK_RET_EBADTRACK;
-}
-
-int
-process_virtio_op(struct disk_op_s *op)
-{
- switch (op->command) {
- case CMD_READ:
- return virtio_blk_read(op);
- case CMD_FORMAT:
- case CMD_WRITE:
- return DISK_RET_EWRITEPROTECT;
- case CMD_RESET:
- case CMD_ISREADY:
- case CMD_VERIFY:
- case CMD_SEEK:
- return DISK_RET_SUCCESS;
- default:
- op->count = 0;
- return DISK_RET_EPARAM;
- }
-}
-
-void
-virtio_blk_setup(void)
-{
- ASSERT32FLAT();
- if (! CONFIG_VIRTIO_BLK)
- return;
-
- dprintf(3, "init virtio-blk\n");
-
- int bdf, max;
- u32 id = PCI_VENDOR_ID_REDHAT_QUMRANET | (PCI_DEVICE_ID_VIRTIO_BLK << 16);
- foreachpci(bdf, max) {
- u32 v = pci_config_readl(bdf, PCI_VENDOR_ID);
- if (v != id)
- continue;
- dprintf(3, "found virtio-blk at %x:%x\n", pci_bdf_to_bus(bdf),
- pci_bdf_to_dev(bdf));
- struct virtiodrive_s *vdrive_g = malloc_fseg(sizeof(*vdrive_g));
- struct vring_virtqueue *vq = malloc_low(sizeof(*vq));
- if (!vdrive_g || !vq) {
- fail:
- free(vdrive_g);
- free(vq);
- dprintf(1, "Can't alloca memory for virtio-blk %x:%x\n",
- pci_bdf_to_bus(bdf), pci_bdf_to_dev(bdf));
- return;
- }
-
- u16 ioaddr = pci_config_readl(bdf, PCI_BASE_ADDRESS_0) &
- PCI_BASE_ADDRESS_IO_MASK;
-
- memset(vdrive_g, 0, sizeof(*vdrive_g));
- vdrive_g->ioaddr = ioaddr;
- vdrive_g->vq = vq;
-
- vp_reset(ioaddr);
- vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE |
- VIRTIO_CONFIG_S_DRIVER );
-
- if (vp_find_vq(ioaddr, 0, vdrive_g->vq) < 0 ) {
- free(vdrive_g);
- free(vq);
- dprintf(1, "fail to find vq for virtio-blk %x:%x\n",
- pci_bdf_to_bus (bdf), pci_bdf_to_dev(bdf));
- continue;
- }
-
- struct drive_s *drive_g = allocDrive();
- if (!drive_g)
- goto fail;
-
- drive_g->type = DTYPE_VIRTIO;
- drive_g->cntl_id = bdf;
- drive_g->cntl_info = (u32)vdrive_g;
-
- struct virtio_blk_config cfg;
- vp_get(ioaddr, 0, &cfg, sizeof(cfg));
-
- u32 f = vp_get_features(ioaddr);
- drive_g->blksize = (f & (1 << VIRTIO_BLK_F_BLK_SIZE)) ?
- cfg.blk_size : DISK_SECTOR_SIZE;
- drive_g->sectors = cfg.capacity;
- dprintf(3, "virtio-blk %x:%x blksize=%d sectors=%u\n",
- pci_bdf_to_bus (bdf), pci_bdf_to_dev(bdf),
- drive_g->blksize, (u32)drive_g->sectors);
-
- drive_g->pchs.cylinders = cfg.cylinders;
- drive_g->pchs.heads = cfg.heads;
- drive_g->pchs.spt = cfg.sectors;
-
- setup_translation(drive_g);
- add_bcv_internal(drive_g);
-
- vp_set_status(ioaddr, VIRTIO_CONFIG_S_ACKNOWLEDGE |
- VIRTIO_CONFIG_S_DRIVER | VIRTIO_CONFIG_S_DRIVER_OK);
- }
-}
-
-void
-describe_virtio(struct drive_s *drive_g)
-{
- printf("Virtio disk PCI:%x:%x", pci_bdf_to_bus(drive_g->cntl_id),
- pci_bdf_to_dev(drive_g->cntl_id));
-}
diff --git a/src/virtio-blk.h b/src/virtio-blk.h
deleted file mode 100644
index 43a37d6..0000000
--- a/src/virtio-blk.h
+++ /dev/null
@@ -1,44 +0,0 @@
-#ifndef _VIRTIO_BLK_H
-#define _VIRTIO_BLK_H
-
-struct virtio_blk_config
-{
- u64 capacity;
- u32 size_max;
- u32 seg_max;
- u16 cylinders;
- u8 heads;
- u8 sectors;
- u32 blk_size;
- u8 physical_block_exp;
- u8 alignment_offset;
- u16 min_io_size;
- u32 opt_io_size;
-} __attribute__((packed));
-
-#define VIRTIO_BLK_F_BLK_SIZE 6
-
-/* These two define direction. */
-#define VIRTIO_BLK_T_IN 0
-#define VIRTIO_BLK_T_OUT 1
-
-/* This is the first element of the read scatter-gather list. */
-struct virtio_blk_outhdr {
- /* VIRTIO_BLK_T* */
- u32 type;
- /* io priority. */
- u32 ioprio;
- /* Sector (ie. 512 byte offset) */
- u64 sector;
-};
-
-#define VIRTIO_BLK_S_OK 0
-#define VIRTIO_BLK_S_IOERR 1
-#define VIRTIO_BLK_S_UNSUPP 2
-
-struct disk_op_s;
-int process_virtio_op(struct disk_op_s *op);
-void virtio_blk_setup(void);
-void describe_virtio(struct drive_s *drive_g);
-
-#endif /* _VIRTIO_BLK_H */
diff --git a/src/virtio-pci.c b/src/virtio-pci.c
deleted file mode 100644
index db19e97..0000000
--- a/src/virtio-pci.c
+++ /dev/null
@@ -1,69 +0,0 @@
-/* virtio-pci.c - pci interface for virtio interface
- *
- * (c) Copyright 2008 Bull S.A.S.
- *
- * Author: Laurent Vivier <[email protected]>
- *
- * some parts from Linux Virtio PCI driver
- *
- * Copyright IBM Corp. 2007
- * Authors: Anthony Liguori <[email protected]>
- *
- * Adopted for Seabios: Gleb Natapov <[email protected]>
- *
- * This work is licensed under the terms of the GNU LGPLv3
- * See the COPYING file in the top-level directory.
- */
-
-#include "virtio-ring.h"
-#include "virtio-pci.h"
-#include "config.h" // CONFIG_DEBUG_LEVEL
-#include "util.h" // dprintf
-
-int vp_find_vq(unsigned int ioaddr, int queue_index,
- struct vring_virtqueue *vq)
-{
- struct vring * vr = &vq->vring;
- u16 num;
-
- ASSERT32FLAT();
- /* select the queue */
-
- outw(queue_index, ioaddr + VIRTIO_PCI_QUEUE_SEL);
-
- /* check if the queue is available */
-
- num = inw(ioaddr + VIRTIO_PCI_QUEUE_NUM);
- if (!num) {
- dprintf(1, "ERROR: queue size is 0\n");
- return -1;
- }
-
- if (num > MAX_QUEUE_NUM) {
- dprintf(1, "ERROR: queue size %d > %d\n", num, MAX_QUEUE_NUM);
- return -1;
- }
-
- /* check if the queue is already active */
-
- if (inl(ioaddr + VIRTIO_PCI_QUEUE_PFN)) {
- dprintf(1, "ERROR: queue already active\n");
- return -1;
- }
-
- vq->queue_index = queue_index;
-
- /* initialize the queue */
-
- vring_init(vr, num, (unsigned char*)&vq->queue);
-
- /* activate the queue
- *
- * NOTE: vr->desc is initialized by vring_init()
- */
-
- outl((unsigned long)virt_to_phys(vr->desc) >> PAGE_SHIFT,
- ioaddr + VIRTIO_PCI_QUEUE_PFN);
-
- return num;
-}
diff --git a/src/virtio-pci.h b/src/virtio-pci.h
deleted file mode 100644
index 9da761d..0000000
--- a/src/virtio-pci.h
+++ /dev/null
@@ -1,100 +0,0 @@
-#ifndef _VIRTIO_PCI_H
-#define _VIRTIO_PCI_H
-
-#include "ioport.h" // inl
-
-/* A 32-bit r/o bitmask of the features supported by the host */
-#define VIRTIO_PCI_HOST_FEATURES 0
-
-/* A 32-bit r/w bitmask of features activated by the guest */
-#define VIRTIO_PCI_GUEST_FEATURES 4
-
-/* A 32-bit r/w PFN for the currently selected queue */
-#define VIRTIO_PCI_QUEUE_PFN 8
-
-/* A 16-bit r/o queue size for the currently selected queue */
-#define VIRTIO_PCI_QUEUE_NUM 12
-
-/* A 16-bit r/w queue selector */
-#define VIRTIO_PCI_QUEUE_SEL 14
-
-/* A 16-bit r/w queue notifier */
-#define VIRTIO_PCI_QUEUE_NOTIFY 16
-
-/* An 8-bit device status register. */
-#define VIRTIO_PCI_STATUS 18
-
-/* An 8-bit r/o interrupt status register. Reading the value will return the
- * current contents of the ISR and will also clear it. This is effectively
- * a read-and-acknowledge. */
-#define VIRTIO_PCI_ISR 19
-
-/* The bit of the ISR which indicates a device configuration change. */
-#define VIRTIO_PCI_ISR_CONFIG 0x2
-
-/* The remaining space is defined by each driver as the per-driver
- * configuration space */
-#define VIRTIO_PCI_CONFIG 20
-
-/* Virtio ABI version, this must match exactly */
-#define VIRTIO_PCI_ABI_VERSION 0
-
-static inline u32 vp_get_features(unsigned int ioaddr)
-{
- return inl(ioaddr + VIRTIO_PCI_HOST_FEATURES);
-}
-
-static inline void vp_set_features(unsigned int ioaddr, u32 features)
-{
- outl(features, ioaddr + VIRTIO_PCI_GUEST_FEATURES);
-}
-
-static inline void vp_get(unsigned int ioaddr, unsigned offset,
- void *buf, unsigned len)
-{
- u8 *ptr = buf;
- unsigned i;
-
- for (i = 0; i < len; i++)
- ptr[i] = inb(ioaddr + VIRTIO_PCI_CONFIG + offset + i);
-}
-
-static inline u8 vp_get_status(unsigned int ioaddr)
-{
- return inb(ioaddr + VIRTIO_PCI_STATUS);
-}
-
-static inline void vp_set_status(unsigned int ioaddr, u8 status)
-{
- if (status == 0) /* reset */
- return;
- outb(status, ioaddr + VIRTIO_PCI_STATUS);
-}
-
-
-static inline void vp_reset(unsigned int ioaddr)
-{
- outb(0, ioaddr + VIRTIO_PCI_STATUS);
- (void)inb(ioaddr + VIRTIO_PCI_ISR);
-}
-
-static inline void vp_notify(unsigned int ioaddr, int queue_index)
-{
- outw(queue_index, ioaddr + VIRTIO_PCI_QUEUE_NOTIFY);
-}
-
-static inline void vp_del_vq(unsigned int ioaddr, int queue_index)
-{
- /* select the queue */
-
- outw(queue_index, ioaddr + VIRTIO_PCI_QUEUE_SEL);
-
- /* deactivate the queue */
-
- outl(0, ioaddr + VIRTIO_PCI_QUEUE_PFN);
-}
-
-struct vring_virtqueue;
-int vp_find_vq(unsigned int ioaddr, int queue_index,
- struct vring_virtqueue *vq);
-#endif /* _VIRTIO_PCI_H_ */
diff --git a/src/virtio-ring.c b/src/virtio-ring.c
deleted file mode 100644
index 7565688..0000000
--- a/src/virtio-ring.c
+++ /dev/null
@@ -1,154 +0,0 @@
-/* virtio-pci.c - virtio ring management
- *
- * (c) Copyright 2008 Bull S.A.S.
- *
- * Author: Laurent Vivier <[email protected]>
- *
- * some parts from Linux Virtio Ring
- *
- * Copyright Rusty Russell IBM Corporation 2007
- *
- * Adopted for Seabios: Gleb Natapov <[email protected]>
- *
- * This work is licensed under the terms of the GNU LGPLv3
- * See the COPYING file in the top-level directory.
- *
- *
- */
-
-#include "virtio-ring.h"
-#include "virtio-pci.h"
-#include "biosvar.h" // GET_GLOBAL
-#include "util.h" // dprintf
-
-#define BUG() do { \
- dprintf(1, "BUG: failure at %s:%d/%s()!\n", \
- __FILE__, __LINE__, __func__); \
- while(1); \
- } while (0)
-#define BUG_ON(condition) do { if (condition) BUG(); } while (0)
-
-/*
- * vring_more_used
- *
- * is there some used buffers ?
- *
- */
-
-int vring_more_used(struct vring_virtqueue *vq)
-{
- struct vring_used *used = GET_FLATPTR(vq->vring.used);
- wmb();
- return GET_FLATPTR(vq->last_used_idx) != GET_FLATPTR(used->idx);
-}
-
-/*
- * vring_free
- *
- * put at the begin of the free list the current desc[head]
- */
-
-void vring_detach(struct vring_virtqueue *vq, unsigned int head)
-{
- struct vring *vr = &vq->vring;
- struct vring_desc *desc = GET_FLATPTR(vr->desc);
- unsigned int i;
-
- /* find end of given descriptor */
-
- i = head;
- while (GET_FLATPTR(desc[i].flags) & VRING_DESC_F_NEXT)
- i = GET_FLATPTR(desc[i].next);
-
- /* link it with free list and point to it */
-
- SET_FLATPTR(desc[i].next, GET_FLATPTR(vq->free_head));
- wmb();
- SET_FLATPTR(vq->free_head, head);
-}
-
-/*
- * vring_get_buf
- *
- * get a buffer from the used list
- *
- */
-
-int vring_get_buf(struct vring_virtqueue *vq, unsigned int *len)
-{
- struct vring *vr = &vq->vring;
- struct vring_used_elem *elem;
- struct vring_used *used = GET_FLATPTR(vq->vring.used);
- u32 id;
- int ret;
-
-// BUG_ON(!vring_more_used(vq));
-
- elem = &used->ring[GET_FLATPTR(vq->last_used_idx) % GET_FLATPTR(vr->num)];
- wmb();
- id = GET_FLATPTR(elem->id);
- if (len != NULL)
- *len = GET_FLATPTR(elem->len);
-
- ret = GET_FLATPTR(vq->vdata[id]);
-
- vring_detach(vq, id);
-
- SET_FLATPTR(vq->last_used_idx, GET_FLATPTR(vq->last_used_idx) + 1);
-
- return ret;
-}
-
-void vring_add_buf(struct vring_virtqueue *vq,
- struct vring_list list[],
- unsigned int out, unsigned int in,
- int index, int num_added)
-{
- struct vring *vr = &vq->vring;
- int i, av, head, prev;
- struct vring_desc *desc = GET_FLATPTR(vr->desc);
- struct vring_avail *avail = GET_FLATPTR(vr->avail);
-
- BUG_ON(out + in == 0);
-
- prev = 0;
- head = GET_FLATPTR(vq->free_head);
- for (i = head; out; i = GET_FLATPTR(desc[i].next), out--) {
- SET_FLATPTR(desc[i].flags, VRING_DESC_F_NEXT);
- SET_FLATPTR(desc[i].addr, (u64)virt_to_phys(list->addr));
- SET_FLATPTR(desc[i].len, list->length);
- prev = i;
- list++;
- }
- for ( ; in; i = GET_FLATPTR(desc[i].next), in--) {
- SET_FLATPTR(desc[i].flags, VRING_DESC_F_NEXT|VRING_DESC_F_WRITE);
- SET_FLATPTR(desc[i].addr, (u64)virt_to_phys(list->addr));
- SET_FLATPTR(desc[i].len, list->length);
- prev = i;
- list++;
- }
- SET_FLATPTR(desc[prev].flags,
- GET_FLATPTR(desc[prev].flags) & ~VRING_DESC_F_NEXT);
-
- SET_FLATPTR(vq->free_head, i);
-
- SET_FLATPTR(vq->vdata[head], index);
-
- av = (GET_FLATPTR(avail->idx) + num_added) % GET_FLATPTR(vr->num);
- SET_FLATPTR(avail->ring[av], head);
- wmb();
-}
-
-void vring_kick(unsigned int ioaddr, struct vring_virtqueue *vq, int num_added)
-{
- struct vring *vr = &vq->vring;
- struct vring_avail *avail = GET_FLATPTR(vr->avail);
- struct vring_used *used = GET_FLATPTR(vq->vring.used);
-
- wmb();
- SET_FLATPTR(avail->idx, GET_FLATPTR(avail->idx) + num_added);
-
- mb();
- if (!(GET_FLATPTR(used->flags) & VRING_USED_F_NO_NOTIFY))
- vp_notify(ioaddr, GET_FLATPTR(vq->queue_index));
-}
diff --git a/src/virtio-ring.h b/src/virtio-ring.h
deleted file mode 100644
index 939c946..0000000
--- a/src/virtio-ring.h
+++ /dev/null
@@ -1,129 +0,0 @@
-#ifndef _VIRTIO_RING_H
-#define _VIRTIO_RING_H
-
-#include "types.h" // u64
-#include "memmap.h" // PAGE_SIZE
-
-#define PAGE_SHIFT 12
-#define PAGE_MASK (PAGE_SIZE-1)
-
-#define virt_to_phys(v) (unsigned long)(v)
-#define phys_to_virt(p) (void*)(p)
-#define wmb() barrier()
-#define mb() barrier()
-
-/* Status byte for guest to report progress, and synchronize features. */
-/* We have seen device and processed generic fields (VIRTIO_CONFIG_F_VIRTIO) */
-#define VIRTIO_CONFIG_S_ACKNOWLEDGE 1
-/* We have found a driver for the device. */
-#define VIRTIO_CONFIG_S_DRIVER 2
-/* Driver has used its parts of the config, and is happy */
-#define VIRTIO_CONFIG_S_DRIVER_OK 4
-/* We've given up on this device. */
-#define VIRTIO_CONFIG_S_FAILED 0x80
-
-#define MAX_QUEUE_NUM (128)
-
-#define VRING_DESC_F_NEXT 1
-#define VRING_DESC_F_WRITE 2
-
-#define VRING_AVAIL_F_NO_INTERRUPT 1
-
-#define VRING_USED_F_NO_NOTIFY 1
-
-struct vring_desc
-{
- u64 addr;
- u32 len;
- u16 flags;
- u16 next;
-};
-
-struct vring_avail
-{
- u16 flags;
- u16 idx;
- u16 ring[0];
-};
-
-struct vring_used_elem
-{
- u32 id;
- u32 len;
-};
-
-struct vring_used
-{
- u16 flags;
- u16 idx;
- struct vring_used_elem ring[];
-};
-
-struct vring {
- unsigned int num;
- struct vring_desc *desc;
- struct vring_avail *avail;
- struct vring_used *used;
-};
-
-#define vring_size(num) \
- (((((sizeof(struct vring_desc) * num) + \
- (sizeof(struct vring_avail) + sizeof(u16) * num)) \
- + PAGE_MASK) & ~PAGE_MASK) + \
- (sizeof(struct vring_used) + sizeof(struct vring_used_elem) * num))
-
-typedef unsigned char virtio_queue_t[PAGE_MASK + vring_size(MAX_QUEUE_NUM)];
-
-struct vring_virtqueue {
- virtio_queue_t queue;
- struct vring vring;
- u16 free_head;
- u16 last_used_idx;
- u16 vdata[MAX_QUEUE_NUM];
- /* PCI */
- int queue_index;
-};
-
-struct vring_list {
- char *addr;
- unsigned int length;
-};
-
-static inline void vring_init(struct vring *vr,
- unsigned int num, unsigned char *queue)
-{
- unsigned int i;
- unsigned long pa;
-
- ASSERT32FLAT();
- vr->num = num;
-
- /* physical address of desc must be page aligned */
-
- pa = virt_to_phys(queue);
- pa = (pa + PAGE_MASK) & ~PAGE_MASK;
- vr->desc = phys_to_virt(pa);
-
- vr->avail = (struct vring_avail *)&vr->desc[num];
- vr->avail->flags |= VRING_AVAIL_F_NO_INTERRUPT;
-
- /* physical address of used must be page aligned */
-
- pa = virt_to_phys(&vr->avail->ring[num]);
- pa = (pa + PAGE_MASK) & ~PAGE_MASK;
- vr->used = phys_to_virt(pa);
-
- for (i = 0; i < num - 1; i++)
- vr->desc[i].next = i + 1;
- vr->desc[i].next = 0;
-}
-
-int vring_more_used(struct vring_virtqueue *vq);
-void vring_detach(struct vring_virtqueue *vq, unsigned int head);
-int vring_get_buf(struct vring_virtqueue *vq, unsigned int *len);
-void vring_add_buf(struct vring_virtqueue *vq, struct vring_list list[],
- unsigned int out, unsigned int in,
- int index, int num_added);
-void vring_kick(unsigned int ioaddr, struct vring_virtqueue *vq, int num_added);
-
-#endif /* _VIRTIO_RING_H_ */
--
1.7.0.3