Changeset 38899 in vbox for trunk/src/VBox

Timestamp:

Sep 29, 2011 9:20:08 AM (13 years ago)

Author:

vboxsync

Message:

First cut at VDS support in AHCI BIOS.

Location:

trunk/src/VBox/Devices/PC/BIOS-new

Files:

• ahci.c (modified) (7 diffs)
• makefile (modified) (2 diffs)
• notes.txt (modified) (1 diff)
• vds.c (added)
• vds.h (added)

trunk/src/VBox/Devices/PC/BIOS-new/ahci.c

@@ -27 +27 @@
 #include "inlines.h"
 #include "pciutil.h"
+#include "vds.h"
 
 #define VBOX_AHCI_DEBUG         0
-#define VBOX_AHCI_INT13_DEBUG   0 
+#define VBOX_AHCI_INT13_DEBUG   0
 
 #if VBOX_AHCI_DEBUG
@@ -51 +52 @@
  */
 #define DMA_WORKAROUND      1
+
+/* Number of S/G table entries in EDDS. */
+#define NUM_EDDS_SG         16
+
 
 /**
@@ -69 +74 @@
 
 /**
+ * AHCI PRDT structure.
+ */
+typedef struct
+{
+    uint32_t    phys_addr;
+    uint32_t    something;
+    uint32_t    reserved;
+    uint32_t    len;
+} ahci_prdt;
+
+/**
  * AHCI controller data.
  */
@@ -83 +99 @@
      *  Must be aligned on 128 byte boundary.
      */
-    uint8_t         abCmd[0x90];
-    /** Alignment */
-    uint8_t         abAlignment2[0xF0];
+    uint8_t         abCmd[0x80];
+    /** Physical Region Descriptor Table (PRDT) array. In other
+     *  words, a scatter/gather descriptor list.
+     */
+    ahci_prdt       aPrdt[16];
     /** Memory for the received command FIS area as specified by chapter 4.2.1
      *  of the Intel AHCI spec. This area is normally 256 bytes big but to save memory
@@ -106 +124 @@
     uint8_t         cCdDrives;
     uint8_t         aCdIdMap[AHCI_MAX_STORAGE_DEVICES];
+    /** Number of harddisks detected before the AHCI driver started detection. */
+    uint8_t         cHardDisksOld;
     /** int13 handler to call if given device is not from AHCI. */
     uint16_t        pfnInt13Old;
-    /** Number of harddisks detected before the AHCI driver started detection. */
-    uint8_t         cHardDisksOld;
+    /** VDS EDDS DMA buffer descriptor structure. */
+    vds_edds        edds;
+    vds_sg          edds_more_sg[NUM_EDDS_SG - 1];
 } ahci_t;
 
@@ -340 +361 @@
     ahci->abCmd[13] = u8SectCountExp;
 
-    /* Prepare PRDT. */
-    write_dword(ahci_seg, &AhciData->abCmd[0x80], ahci_addr_to_phys(buf));
-    write_dword(ahci_seg, &AhciData->abCmd[0x8c], (uint32_t)(cbData - 1));
+    /* Lock memory needed for DMA. */
+    ahci->edds.num_avail = NUM_EDDS_SG;
+    vds_build_sg_list( &ahci->edds, buf, cbData );
+
+    /* Set up the PRDT. */
+    ahci->aPrdt[0].phys_addr = ahci->edds.u.sg[0].phys_addr;
+    ahci->aPrdt[0].len       = ahci->edds.u.sg[0].size - 1;
 
     ahci_port_cmd_sync(ahci_seg, u16IoBase, fWrite, 0, 5, cbData);
+
+    /* Unlock the buffer again. */
+    vds_free_sg_list( &ahci->edds );
 }
 
@@ -374 +402 @@
          */
         //@todo: merge memsets?
-        _fmemset(&ahci->aCmdHdr[0], 0, 0x20);
-        _fmemset(&ahci->abCmd[0], 0, 0x84);
-        _fmemset(&ahci->abFisRecv[0], 0, 0x60);
+        _fmemset(&ahci->aCmdHdr[0], 0, sizeof(ahci->aCmdHdr));
+        _fmemset(&ahci->abCmd[0], 0, sizeof(ahci->abCmd));
+        _fmemset(&ahci->abFisRecv[0], 0, sizeof(ahci->abFisRecv));
 
         VBOXAHCI_PORT_WRITE_REG(u16IoBase, u8Port, AHCI_REG_PORT_FB, 0);

trunk/src/VBox/Devices/PC/BIOS-new/makefile

@@ -31 +31 @@
         keyboard.obj disk.obj serial.obj system.obj timepci.obj &
         ps2mouse.obj parallel.obj logo.obj scsi.obj ahci.obj &
-        pciutil.obj pcibio32.obj orgs.obj
+        pciutil.obj vds.obj pcibio32.obj orgs.obj
 
 vbxbios.rom : vbxbios.bin
@@ -54 +54 @@
 clean : .symbolic
         @rm -f *.obj *.err
-        @rm -f vbxbios.bin vbxbios.rom vbxbios.map
+        @rm -f vbxbios.bin vbxbios.rom vbxbios.map vbxbios.sym

trunk/src/VBox/Devices/PC/BIOS-new/notes.txt

@@ -23 +23 @@
 - OS/2 is the only known guest which can run the 16-bit PCI BIOS in protected
   mode (but only if the 32-bit PCI BIOS is unavailable).
+
+- Any disk reads which use bus-master DMA (AHCI, IDE BM) must use VDS
+  (Virtual DMA Services) when present. Otherwise any reads/writes when the
+  real mode addresses don't map directly to physical addresses will fail
+  horribly. DOS 6.x with EMM386 is a good testcase (esp. loading drivers
+  into UMBs).