Changeset 81089 in vbox for trunk/src/VBox/Devices/PC/BIOS

Timestamp:

Sep 30, 2019 10:21:06 PM (6 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

133695

Message:

Devices/BIOS: Skeleton of a VirtIO driver, just detects any device for now, bugref:9440

Location:

trunk/src/VBox/Devices/PC/BIOS

Files:

• Makefile.kmk (modified) (1 diff)
• ebda.h (modified) (4 diffs)
• orgs.asm (modified) (2 diffs)
• virtio.c (added)

trunk/src/VBox/Devices/PC/BIOS/Makefile.kmk

@@ -79 +79 @@
         $(VBoxPcBios32_0_OUTDIR)/VBoxPcBios32.lib \
         orgs.asm
+
+ ifdef VBOX_WITH_VIRTIO_SCSI_BIOS
+  VBoxPcBios386_DEFS += \
+        VBOX_WITH_VIRTIO_SCSI
+  VBoxPcBios386_SOURCES += \
+        virtio.c
+ endif
+
  #$(VBoxPcBios32_1_TARGET) - reference is lost when extending the target. weird.
 

trunk/src/VBox/Devices/PC/BIOS/ebda.h

@@ -89 +89 @@
 #endif
 
-#define BX_MAX_STORAGE_DEVICES (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES)
+#ifdef VBOX_WITH_VIRTIO_SCSI
+    /* Four should be enough for now */
+    #define BX_MAX_VIRTIO_SCSI_DEVICES 4
+
+    /* An AHCI device starts always at BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES. */
+    #define VBOX_IS_VIRTIO_SCSI_DEVICE(device_id) (device_id >= (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES))
+    #define VBOX_GET_VIRTIO_SCSI_DEVICE(device_id) (device_id - (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES))
+#else
+    #define BX_MAX_VIRTIO_SCSI_DEVICES 0
+#endif
+
+#define BX_MAX_STORAGE_DEVICES (BX_MAX_ATA_DEVICES + BX_MAX_SCSI_DEVICES + BX_MAX_AHCI_DEVICES + BX_MAX_VIRTIO_SCSI_DEVICES)
 
 /* Generic storage device types. These depend on the controller type and
@@ -200 +211 @@
 #endif
 
+#ifdef VBOX_WITH_VIRTIO_SCSI
+
+/* VirtIO SCSI specific device information. */
+typedef struct {
+    uint8_t     target;           /* Target ID. */
+} virtio_scsi_dev_t;
+
+#endif
+
 /* Generic disk information. */
 typedef struct {
@@ -276 +296 @@
 #endif
 
+#ifdef VBOX_WITH_VIRTIO_SCSI
+    /* VirtIO SCSI bus-specific device information. */
+    virtio_scsi_dev_t  virtiodev[BX_MAX_VIRTIO_SCSI_DEVICES];
+    uint8_t            virtio_devcnt;        /* Number of VirtIO devices. */
+    uint16_t           virtio_seg;           /* Segment of VirtIO data block. */
+#endif
+
     dpte_t      dpte;               /* Buffer for building a DPTE. */
 } bio_dsk_t;
@@ -308 +335 @@
     fdpt_t      fdpt1;
 
+#ifndef VBOX_WITH_VIRTIO_SCSI /** @todo For development only, need to find a real solution to voercome the 1KB limit. */
     uint8_t     filler2[0xC4];
+#endif
 
     bio_dsk_t   bdisk;      /* Disk driver data (ATA/SCSI/AHCI). */

trunk/src/VBox/Devices/PC/BIOS/orgs.asm

@@ -144 +144 @@
 extrn           _ahci_init:near
 endif
+ifdef VBOX_WITH_VIRTIO_SCSI
+extrn           _virtio_scsi_init:near
+endif
 if VBOX_BIOS_CPU ge 80286
 extrn           _int15_blkmove:near
@@ -645 +648 @@
 endif
 
+ifdef VBOX_WITH_VIRTIO_SCSI
+                ; VirtIO-SCSI driver setup
+                call    _virtio_scsi_init
+endif
+
                 ;; floppy setup
                 call    floppy_post