Changeset 34455 in vbox for trunk/src

Timestamp:

Nov 29, 2010 11:39:07 AM (14 years ago)

Author:

vboxsync

Message:

BIOS: now MCFG region is correctly reported in E820

File:

• trunk/src/VBox/Devices/PC/BIOS/rombios.c (modified) (3 diffs)

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

@@ -4648 +4648 @@
     Bit16u varNum;
 {
-    int iPort = 0x402;
+    int i, iPort = 0x402;
     Bit32u result = 0;
+    Bit8u bits[4];
 
     outw(iPort, varNum);
-    result = (inb(iPort) << 24) | (inb(iPort) <<  16) |
-             (inb(iPort) << 8) | (inb(iPort) << 0);
-    BX_INFO("var %d is %x\n", varNum, result);
+
+    for (i=0; i<4; i++)
+        bits[i] = inb(iPort);
+
+    result = (((Bit32u)bits[3]) << 24) | (((Bit32u)bits[2]) <<  16) |
+             (((Bit32u)bits[1]) <<  8) | (((Bit32u)bits[0]) <<  0);
+
     return result;
 }
@@ -4829 +4834 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0xfffc0000L, 0x00000000L, 0, 0, 2);
-                        if (mcfgStart > 0)
+                        if (mcfgStart != 0)
                             regs.u.r32.ebx = 6;
                         else
@@ -4842 +4847 @@
                         /* PCI MMIO config space (MCFG) */
                         set_e820_range(ES, regs.u.r16.di,
-                                       mcfgStart, mcfgSize, 0, 0, 2);
+                                       mcfgStart, mcfgStart + mcfgSize, 0, 0, 2);
 
                         if (extra_highbits_memory_size || extra_lowbits_memory_size)