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

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

Location:

trunk/src/VBox/Devices/PC

Files:

• BIOS/rombios.c (modified) (5 diffs)
• DevPcBios.cpp (modified) (7 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.

trunk/src/VBox/Devices/PC/DevPcBios.cpp

@@ -178 +178 @@
     /** Number of logical CPUs in guest */
     uint16_t        cCpus;
+    uint32_t        u32McfgBase;
+    uint32_t        cbMcfgLength;
+    uint16_t        iVarNum;
+    uint16_t        iVarPos;
 } DEVPCBIOS, *PDEVPCBIOS;
 
@@ -232 +236 @@
     Assert(u32Val < 256);
 
-#if 1
     int rc = PDMDevHlpCMOSWrite(pDevIns, off, u32Val);
     AssertRC(rc);
-#else
-    PVM pVM = PDMDevHlpGetVM(pDevIns);
-    IOMIOPortWrite(pVM, 0x70, off, 1);
-    IOMIOPortWrite(pVM, 0x71, u32Val, 1);
-    IOMIOPortWrite(pVM, 0x70, 0, 1);
-#endif
 }
 
@@ -641 +638 @@
 }
 
+static uint8_t pcbiosReadVar(PDEVPCBIOS pThis)
+{
+    uint32_t u32Val = 0, u32Size = 4;
+    switch (pThis->iVarNum)
+    {
+        case 1:
+            u32Val = pThis->u32McfgBase;
+            u32Size = 4;
+            break;
+        case 2:
+            u32Val = pThis->cbMcfgLength;
+            u32Size = 4;
+            break;
+        default:
+            AssertMsgFailed(("Unknown variable: %d\n", pThis->iVarNum));
+    }
+    uint32_t iPos = pThis->iVarPos++;
+    if (pThis->iVarPos >= u32Size)
+            pThis->iVarPos = 0;
+
+    Log(("Read pos %d of var %d: %x\n",
+         iPos, pThis->iVarNum, (u32Val >> (iPos*8)) & 0xff));
+
+    return (u32Val >> (iPos*8)) & 0xff;
+}
 
 /**
@@ -655 +677 @@
 static DECLCALLBACK(int) pcbiosIOPortRead(PPDMDEVINS pDevIns, void *pvUser, RTIOPORT Port, uint32_t *pu32, unsigned cb)
 {
-    NOREF(pDevIns);
-    NOREF(pvUser);
-    NOREF(Port);
-    NOREF(pu32);
-    NOREF(cb);
+    if (cb == 1 && Port == 0x402)
+    {
+        PDEVPCBIOS pThis = PDMINS_2_DATA(pDevIns, PDEVPCBIOS);
+        uint8_t u8Val = pcbiosReadVar(pThis);
+        *(uint8_t*)pu32 = u8Val;
+        return VINF_SUCCESS;
+    }
+
     return VERR_IOM_IOPORT_UNUSED;
 }
@@ -725 +750 @@
             pThis->szMsg[++pThis->iMsg] = '\0';
         }
+        return VINF_SUCCESS;
+    }
+
+    if (cb == 2 && Port == 0x402)
+    {
+        PDEVPCBIOS pThis = PDMINS_2_DATA(pDevIns, PDEVPCBIOS);
+        pThis->iVarNum = u32;
+        pThis->iVarPos = 0;
         return VINF_SUCCESS;
     }
@@ -941 +974 @@
                               "IOAPIC\0"
                               "NumCPUs\0"
+                              "McfgBase\0"
+                              "McfgLength\0"
                               "DmiBIOSVendor\0"
                               "DmiBIOSVersion\0"
@@ -986 +1021 @@
         return PDMDEV_SET_ERROR(pDevIns, rc,
                                 N_("Configuration error: Querying \"NumCPUs\" as integer failed"));
+
+    rc = CFGMR3QueryU32Def(pCfg, "McfgBase", &pThis->u32McfgBase, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"\" as integer failed"));
+    rc = CFGMR3QueryU32Def(pCfg, "McfgLength", &pThis->cbMcfgLength, 0);
+    if (RT_FAILURE(rc))
+        return PDMDEV_SET_ERROR(pDevIns, rc,
+                                N_("Configuration error: Querying \"McfgLength\" as integer failed"));
+
 
     LogRel(("[SMP] BIOS with %u CPUs\n", pThis->cCpus));