Changeset 41989 in vbox for trunk/src

Timestamp:

Jul 2, 2012 8:56:03 PM (13 years ago)

Author:

vboxsync

Message:

BIOS: properly detect the ICH9 bridge (fixes PXE with ICH9)

Location:

trunk/src/VBox/Devices/PC

Files:

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

-              r40694
+              r41989
 ifdef PCI_FIXED_HOST_BRIDGE_2
+                ; 1Eh << 11
+                mov     eax, 8000f000h
+                ; 18h << 11
+                mov     eax, 8000c000h
+                mov     dx, PCI_CFG1
+                out     dx, eax
+                mov     dx, PCI_CFG2
+                in      eax, dx
+                cmp     eax, PCI_FIXED_HOST_BRIDGE_2
+                je      pci_present
+                ; 19h << 11
+                mov     eax, 8000c800h
                 mov     dx, PCI_CFG1
                 out     dx, eax

r40694	r41989
6	6
7	7	PCI_FIXED_HOST_BRIDGE_1 equ 12378086h ;; i440FX PCI bridge
8		PCI_FIXED_HOST_BRIDGE_2 equ 244e8086h ;; ICH9 PCI bridge
	8	PCI_FIXED_HOST_BRIDGE_2 equ 24488086h ;; ICH9 PCI bridge
9	9
10	10	MAX_BUSDEVFN equ 10000h ; Max bus/dev/fn to search

-              r41537
+              r41989
 // i440FX is emulated by Bochs and QEMU
 #define PCI_FIXED_HOST_BRIDGE_1  0x12378086 ;; i440FX PCI bridge
 #define PCI_FIXED_HOST_BRIDGE_2  0x244e8086 ;; ICH9 PCI bridge
+#define PCI_FIXED_HOST_BRIDGE_2  0x24488086 ;; ICH9 PCI bridge
 // #20  is dec 20
 …
 #ifdef PCI_FIXED_HOST_BRIDGE_2
+  /* 0x1e << 11 */
+  mov eax, #0x8000f000
+  /* 0x18 << 11 */
+  mov eax, #0x8000c000
+  mov dx, #0x0cf8
+  out dx, eax
+  mov dx, #0x0cfc
+  in  eax, dx
+  cmp eax, #PCI_FIXED_HOST_BRIDGE_2
+  je pci_present
+  /* 0x19 << 11 */
+  mov eax, #0x8000c800
   mov dx, #0x0cf8
   out dx, eax

Note: See TracChangeset for help on using the changeset viewer.