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

Timestamp:

Nov 25, 2019 1:13:14 PM (5 years ago)

Author:

vboxsync

Message:

PC/BIOS/virtio.c: Fixes, seems to work now

File:

• trunk/src/VBox/Devices/PC/BIOS/virtio.c (modified) (9 diffs)

trunk/src/VBox/Devices/PC/BIOS/virtio.c

@@ -67 +67 @@
 {
     /** Flags. */
-    uint16_t        fFlags;
+    volatile uint16_t        fFlags;
     /** Next index to write an available buffer by the driver. */
-    uint16_t        idxNextFree;
+    volatile uint16_t        idxNextFree;
     /** The ring - we only provide one entry. */
-    uint16_t        au16Ring[VIRTIO_SCSI_RING_ELEM];
+    volatile uint16_t        au16Ring[VIRTIO_SCSI_RING_ELEM];
     /** Used event index. */
-    uint16_t        u16EvtUsed;
+    volatile uint16_t        u16EvtUsed;
 } virtio_q_avail_t;
 
@@ -437 +437 @@
 {
     uint16_t idxUsedOld = virtio->Queue.UsedRing.idxNextUsed;
-    uint64_t idxNext = virtio->Queue.AvailRing.idxNextFree;
 
     _fmemset(&virtio->ScsiReqHdr, 0, sizeof(virtio->ScsiReqHdr));
@@ -459 +458 @@
     virtio->Queue.aDescTbl[1].cbBuf         = length;
     virtio->Queue.aDescTbl[1].fFlags        = VIRTIO_Q_DESC_F_NEXT;
-    virtio->Queue.aDescTbl[1].idxNext       = 1;
-
-    virtio->Queue.aDescTbl[1].GCPhysBufLow  = virtio_addr_to_phys(&virtio->ScsiReqSts);
-    virtio->Queue.aDescTbl[1].GCPhysBufHigh = 0;
-    virtio->Queue.aDescTbl[1].cbBuf         = sizeof(virtio->ScsiReqSts);
-    virtio->Queue.aDescTbl[1].fFlags        = VIRTIO_Q_DESC_F_WRITE; /* End of chain. */
-    virtio->Queue.aDescTbl[1].idxNext       = 0;
+    virtio->Queue.aDescTbl[1].idxNext       = 2;
+
+    virtio->Queue.aDescTbl[2].GCPhysBufLow  = virtio_addr_to_phys(&virtio->ScsiReqSts);
+    virtio->Queue.aDescTbl[2].GCPhysBufHigh = 0;
+    virtio->Queue.aDescTbl[2].cbBuf         = sizeof(virtio->ScsiReqSts);
+    virtio->Queue.aDescTbl[2].fFlags        = VIRTIO_Q_DESC_F_WRITE; /* End of chain. */
+    virtio->Queue.aDescTbl[2].idxNext       = 0;
 
     /* Put it into the queue. */
@@ -474 +473 @@
     /* Notify the device about the new command. */
     DBG_VIRTIO("VirtIO: Submitting new request, Queue.offNotify=0x%x\n", virtio->Queue.offNotify);
-    virtio_reg_notify_write_u16(virtio, virtio->Queue.offNotify, idxNext);
+    virtio_reg_notify_write_u16(virtio, virtio->Queue.offNotify, VIRTIO_SCSI_Q_REQUEST);
 
     /* Wait for it to complete. */
@@ -481 +480 @@
     DBG_VIRTIO("VirtIO: Request complete u8Response=%u\n", virtio->ScsiReqSts.u8Response);
 
-    /* Read ISR register to de-assert the interrupt, don't need to do anything with out. */
+    /* Read ISR register to de-assert the interrupt, don't need to do anything with it. */
     virtio_reg_isr_read_u8(virtio);
 
@@ -494 +493 @@
 {
     uint16_t idxUsedOld = virtio->Queue.UsedRing.idxNextUsed;
-    uint64_t idxNext = virtio->Queue.AvailRing.idxNextFree;
 
     _fmemset(&virtio->ScsiReqHdr, 0, sizeof(virtio->ScsiReqHdr));
@@ -532 +530 @@
     /* Notify the device about the new command. */
     DBG_VIRTIO("VirtIO: Submitting new request, Queue.offNotify=0x%x\n", virtio->Queue.offNotify);
-    virtio_reg_notify_write_u16(virtio, virtio->Queue.offNotify, idxNext);
+    virtio_reg_notify_write_u16(virtio, virtio->Queue.offNotify, VIRTIO_SCSI_Q_REQUEST);
 
     /* Wait for it to complete. */
@@ -539 +537 @@
     DBG_VIRTIO("VirtIO: Request complete u8Response=%u\n", virtio->ScsiReqSts.u8Response);
 
-    /* Read ISR register to de-assert the interrupt, don't need to do anything with out. */
+    /* Read ISR register to de-assert the interrupt, don't need to do anything with it. */
     virtio_reg_isr_read_u8(virtio);
 
@@ -1039 +1037 @@
                 default:
                     DBG_VIRTIO("VirtIO SCSI HBA with unknown PCI capability type 0x%x\n", u8PciVirtioCfg);
+                    break;
             }
         }