Changeset 38848 in vbox

Timestamp:

Sep 23, 2011 1:27:55 PM (13 years ago)

Author:

vboxsync

Message:

Integrated basic AHCI support into new BIOS.

Location:

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

Files:

• ahci.c (added)
• ata.c (modified) (2 diffs)
• ebda.h (modified) (2 diffs)
• makefile (modified) (3 diffs)
• orgs.asm (modified) (6 diffs)

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

@@ -380 +380 @@
     AtaData->channels[1].irq     = 15;
 #endif
+#if 0   //@todo - temporarily removed to avoid conflict with AHCI
 #if BX_MAX_ATA_INTERFACES > 2
     AtaData->channels[2].iface   = ATA_IFACE_ISA;
@@ -391 +392 @@
     AtaData->channels[3].iobase2 = 0x360;
     AtaData->channels[3].irq     = 11;
+#endif
 #endif
 #if BX_MAX_ATA_INTERFACES > 4

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

@@ -211 +211 @@
     fdpt_t      fdpt1;
 
+#if 0
     unsigned char filler2[0xC4];
+#else
+    unsigned char filler2[0xC2];
+    uint16_t    ahci_seg;
+#endif
 
     // ATA Driver data
@@ -228 +233 @@
 #ifdef VBOX_WITH_BIOS_AHCI
 //    ahci_t      ahci;
-    uint16_t    SegAhci;    //@todo: rename...
+//    uint16_t    ahci_seg;    //@todo: Someone is trashing the data here!?!
 #endif
 

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

@@ -16 +16 @@
 CFLAGS = -q -0 -wx -zu -s -oas -d1+ -ms
 DEFS   = -DVBOX -DVBOX_LANBOOT_SEG=0xE200 -DVBOX_VERSION_STRING=$(QUOTE)0.9$(QUOTE) &
- -DVBOX_WITH_SCSI
+ -DVBOX_WITH_SCSI -DVBOX_WITH_BIOS_AHCI
 
 AFLAGS = -q -0 -wx
@@ -30 +30 @@
 OBJS =  bios.obj print.obj ata.obj floppy.obj eltorito.obj boot.obj &
         keyboard.obj disk.obj serial.obj system.obj timepci.obj &
-        ps2mouse.obj parallel.obj logo.obj scsi.obj pcibio32.obj orgs.obj
+        ps2mouse.obj parallel.obj logo.obj scsi.obj ahci.obj &
+        pcibio32.obj orgs.obj
 
 vbxbios.rom : vbxbios.bin
@@ -41 +42 @@
          clname DATA segaddr=0xF000 segment _DATA &
          clname CODE &
-         segment _TEXT segaddr=0xF000 offset=0x1400 &
+         segment _TEXT segaddr=0xF000 offset=0x1600 &
          segment BIOS32 segaddr=0xF000 offset=0xDE00 &
          segment BIOSSEG segaddr=0xF000 offset=0xE000 &

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

@@ -100 +100 @@
 extrn           _cdemu_isactive:near
 extrn           _cdemu_emulated_drive:near
+extrn           _ahci_int13:near
 extrn           _int13_harddisk:near
 extrn           _int13_harddisk_ext:near
@@ -114 +115 @@
 extrn           _int74_function:near
 extrn           _ata_init:near
+extrn           _ahci_init:near
 extrn           _scsi_init:near
 extrn           _ata_detect:near
@@ -153 +155 @@
 public          hard_drive_post
 public          int13_legacy
+public          ahci_int13_handler
 public          int70_handler
 public          int75_handler
@@ -450 +453 @@
 endif
 
-                call    _print_bios_banner
-
                 ;; floppy setup
                 call    floppy_post
@@ -458 +459 @@
                 call    hard_drive_post
 
+                C_SETUP                 ; in case assembly code changed things
+ifdef VBOX_WITH_BIOS_AHCI
+                ; AHCI driver setup
+                call    _ahci_init
+endif
+
+                call    _print_bios_banner
+
                 ;; El Torito floppy/hard disk emulation
-                C_SETUP                 ; in case assembly code changed things
                 call    _cdemu_init
 
@@ -1482 +1490 @@
 include pirq.inc
 
+ifdef VBOX_WITH_BIOS_AHCI
+
+ahci_int13_handler:
+                ;; allocate space for IRET frame used to call old INT 13h
+                push    ax
+                push    ax
+                push    ax
+
+                pusha
+                push    ds
+                push    es
+                push    0               ; Room for return value (default 0)
+                C_SETUP
+                call    _ahci_int13
+                pop     ax
+                pop     es
+                pop     ds
+                cmp     ax, 0           ; Check if interrupt was handled
+                je      ahci_int13_out
+
+                popa                    ; Restore caller's registers
+                iret                    ; Call old handler
+
+ahci_int13_out:
+                popa
+                add     sp, 6           ; Remove the IRET frame
+                iret
+                
+endif
 
 ;; --------------------------------------------------------