Changeset 32960 in vbox for trunk/src/VBox

Timestamp:

Oct 6, 2010 4:59:56 PM (14 years ago)

Author:

vboxsync

Message:

PCI: bad typo in PCI address computation, now Windows boots fine with MCFG

Location:

trunk/src/VBox/Devices

Files:

• Bus/DevPciIch9.cpp (modified) (6 diffs)
• PC/DevAPIC.cpp (modified) (3 diffs)

trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

@@ -193 +193 @@
     GCPhysAddr = GCPhysAddr - pGlobals->u64PciConfigMMioAddress;
     pPciAddr->iBus          = (GCPhysAddr >> 20) & ((1<<8)       - 1);
-    pPciAddr->iDeviceFunc   = (GCPhysAddr >> 15) & ((1<<(5+3))   - 1); // 5 bits - device, 3 bits - function
+    pPciAddr->iDeviceFunc   = (GCPhysAddr >> 12) & ((1<<(5+3))   - 1); // 5 bits - device, 3 bits - function
     pPciAddr->iRegister     = (GCPhysAddr >>  0) & ((1<<(6+4+2)) - 1); // 6 bits - register, 4 bits - extended register, 2 bits -Byte Enable
 }
@@ -573 +573 @@
     uint32_t u32 = 0;
 
+    Log2(("ich9pciMcfgMMIOWrite: %p(%d) \n", GCPhysAddr, cb));
+
     PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
 
@@ -604 +606 @@
     uint32_t    rv = 0xffffffff;
 
-    PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
+    Log2(("ich9pciMcfgMMIORead: %p(%d) \n", GCPhysAddr, cb));
+
+    PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_READ);
 
     ich9pciPhysToPciAddr(pGlobals, GCPhysAddr, &aDest);
@@ -2206 +2210 @@
     if (pGlobals->u64PciConfigMMioAddress != 0)
     {
-        rc = PDMDevHlpMMIORegister(pDevIns, pGlobals->u64PciConfigMMioAddress, pGlobals->u64PciConfigMMioLength, pGlobals,
-                                   ich9pciMcfgMMIOWrite, ich9pciMcfgMMIORead, NULL, "MCFG ranges");
+        rc = PDMDevHlpMMIORegister(pDevIns,
+                                   pGlobals->u64PciConfigMMioAddress,
+                                   pGlobals->u64PciConfigMMioLength,
+                                   0,
+                                   ich9pciMcfgMMIOWrite,
+                                   ich9pciMcfgMMIORead,
+                                   NULL /* fill */,
+                                   "MCFG ranges");
         if (RT_FAILURE(rc))
         {
@@ -2223 +2233 @@
                                           "ich9pciMcfgMMIOWrite",
                                           "ich9pciMcfgMMIORead",
-                                          NULL);
+                                          NULL /* fill */);
              if (RT_FAILURE(rc))
              {
@@ -2241 +2251 @@
                                           "ich9pciMcfgMMIOWrite",
                                           "ich9pciMcfgMMIORead",
-                                          NULL);
+                                          NULL /* fill */);
              if (RT_FAILURE(rc))
              {

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

@@ -1449 +1449 @@
 
     index = (addr >> 4) & 0xff;
-    addr -= (s->apicbase & ~0xfff);
-
-    if (addr > 0xfff || (index == 0))
-    {
-        /* MSR area read, undefined result by spec */
-        Log(("APIC: MSR area read: %x\n", index));
-        return 0;
-    }
 
     switch(index) {
@@ -1542 +1534 @@
 #endif
 
-    index = (addr >> 4) & 0xff;  
+    index = (addr >> 4) & 0xff;
 
     switch(index) {
@@ -2850 +2842 @@
      */
     IoApicReg.u32Version  = PDM_IOAPICREG_VERSION;
-    IoApicReg.pfnSetIrqR3 = ioapicSetIrq;    
+    IoApicReg.pfnSetIrqR3 = ioapicSetIrq;
     IoApicReg.pszSetIrqRC = fGCEnabled ? "ioapicSetIrq" : NULL;
     IoApicReg.pszSetIrqR0 = fR0Enabled ? "ioapicSetIrq" : NULL;