Changeset 67668 in vbox for trunk/src/VBox/Devices/PC

Timestamp:

Jun 28, 2017 4:28:34 PM (7 years ago)

Author:

vboxsync

Message:

PDM: rip out the entire FakePCIBIOS support, no longer triggered from here
Devices/Bus: register magic port to trigger FakePCIBIOS
BIOS: disable the unneeded function for PCI resource/IRQ initialization (only partially used anyway) and use the magic port to trigger FakePCIBIOS

File:

• trunk/src/VBox/Devices/PC/BIOS/pcibios.inc (modified) (6 diffs)

trunk/src/VBox/Devices/PC/BIOS/pcibios.inc

@@ -96 +96 @@
                 push    bp
                 mov     bp, sp
+ifdef VBOX
+                mov     eax,19200509 
+                mov     dx,410h
+                out     dx,  eax
+else
+; This incomplete PCI resource setup code is less functional than the PCI
+; resource assignment created by the fake PCI BIOS and is therefore disabled.
+; Blindly enabling everything on the root bus (including bus mastering!) can
+; only be called buggy. It causes the trouble with AMD PCNet which it then
+; tries to work around, but that still contains a race.
                 mov     eax, 0E0000000h ; base for memory init
                 push    eax
@@ -111 +121 @@
                 jz      next_pci_dev
 
-ifndef VBOX ; This currently breaks restoring a previously saved state. */
+ifndef VBOX ; This currently breaks restoring a previously saved state.
                 mov     dl, 4   ; disable i/o and memory space access
                 call    pcibios_init_sel_reg
@@ -201 +211 @@
                 cmp     bx, 0100h
                 jne     pci_init_io_loop1
+endif ; !VBOX
                 mov     sp, bp
                 pop     bp
@@ -230 +241 @@
                 mov     ax, 0F000h
                 mov     ds, ax
+ifndef VBOX
+; this code works OK, but it's unnecessary effort since the fake PCI BIOS
+; already configured the IRQ lines and the ELCR correctly
                 mov     dx, 04D0h ;; reset ELCR1 + ELCR2
                 mov     al, 0
@@ -282 +296 @@
                 mov     dl, 3Ch
                 call pcibios_init_sel_reg
-                mov     dx, PCI_CFG2 + 1 ; TODO: was #0x0cfd - is that right?
+                mov     dx, PCI_CFG2 + 1 ; access config space at 3Dh
                 in      al, dx
                 and     al, 7
@@ -332 +346 @@
                 pop     bx
 pci_init_end:
+endif
                 pop             bp
                 pop             ds