Changeset 34426 in vbox for trunk/src/VBox/Devices/PC/BIOS

Timestamp:

Nov 26, 2010 8:34:43 PM (14 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

68197

Message:

BIOS: report MCFG region via E820, if present

File:

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

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

@@ -4645 +4645 @@
 }
 
+Bit32u readBiosVar(varNum)
+    Bit16u varNum;
+{
+    int iPort = 0x402;
+    Bit32u result = 0;
+
+    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);
+    return result;
+}
+
   void
 int15_function32(regs, ES, DS, FLAGS)
@@ -4654 +4667 @@
   Bit16u  CX,DX;
   Bit8u   extra_highbits_memory_size=0;
+  Bit32u  mcfgStart, mcfgSize;
 
 BX_DEBUG_INT15("int15 AX=%04x\n",regs.u.r16.ax);
@@ -4746 +4760 @@
                 extra_highbits_memory_size = inb_cmos(0x5d);
 #endif /* !VBOX */
+
+                mcfgStart = readBiosVar(1);
+                mcfgSize  = readBiosVar(2);
 
                 switch(regs.u.r16.bx)
@@ -4812 +4829 @@
                         set_e820_range(ES, regs.u.r16.di,
                                        0xfffc0000L, 0x00000000L, 0, 0, 2);
-                        /* Temporary disabled MCFG code */
-#if 0
-                        regs.u.r32.ebx = 6;
+                        if (mcfgStart > 0)
+                            regs.u.r32.ebx = 6;
+                        else
+                        {
+                            if (extra_highbits_memory_size || extra_lowbits_memory_size)
+                                regs.u.r32.ebx = 7;
+                            else
+                                regs.u.r32.ebx = 0;
+                        }
                         break;
                      case 6:
-                        /* PCI MMIO config space */
+                        /* PCI MMIO config space (MCFG) */
                         set_e820_range(ES, regs.u.r16.di,
-                                       0xd0000000L, 0xe0000000L, 0, 0, 2);
+                                       mcfgStart, mcfgSize, 0, 0, 2);
+
                         if (extra_highbits_memory_size || extra_lowbits_memory_size)
                             regs.u.r32.ebx = 7;
@@ -4826 +4850 @@
                         break;
                     case 7:
-#else
-                        if (extra_highbits_memory_size || extra_lowbits_memory_size)
-                            regs.u.r32.ebx = 6;
-                        else
-                            regs.u.r32.ebx = 0;
-                        break;
-                    case 6:
-#endif
 #ifdef VBOX /* Don't succeeded if no memory above 4 GB.  */
                         /* Mapping of memory above 4 GB if present.