vbox的更動 65867 路徑 trunk/src/VBox/Devices/Bus/DevPciIch9.cpp

時間撮記:

2017-2-23 下午04:34:51 (8 年 以前)

作者:

vboxsync

訊息:

DevPciIch9.cpp: when updating the mappings, refer to the (in the raw/pass-through case cached) config space content. Calling the config space read/write callbacks could confuse the device emulation, if the device-specific write callback does something non-trivial (which could delay the config space from being visible until the write transaction is finished).

檔案:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (修改) (3 筆差異)

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

@@ -2351 +2351 @@
 static void devpciR3UpdateMappings(PPDMPCIDEV pPciDev, bool fP2PBridge)
 {
-    /** @todo r=klaus analyze if it's safe to rely on cached config space data, as that's cheaper to read in the raw pci device and pass-through cases. */
-    uint16_t const u16Cmd = ich9pciGetWord(pPciDev, VBOX_PCI_COMMAND);
+    /* safe, only needs to go to the config space array */
+    uint16_t const u16Cmd = PDMPciDevGetWord(pPciDev, VBOX_PCI_COMMAND);
     for (unsigned iRegion = 0; iRegion < VBOX_PCI_NUM_REGIONS; iRegion++)
     {
@@ -2374 +2374 @@
                 if (u16Cmd & VBOX_PCI_COMMAND_IO)
                 {
-                    uint32_t uIoBase = ich9pciGetDWord(pPciDev, offCfgReg);
+                    /* safe, only needs to go to the config space array */
+                    uint32_t uIoBase = PDMPciDevGetDWord(pPciDev, offCfgReg);
                     uIoBase &= ~(uint32_t)(cbRegion - 1);
 
@@ -2395 +2396 @@
             else if (u16Cmd & VBOX_PCI_COMMAND_MEMORY)
             {
-                uint64_t uMemBase = ich9pciGetDWord(pPciDev, offCfgReg);
+                /* safe, only needs to go to the config space array */
+                uint64_t uMemBase = PDMPciDevGetDWord(pPciDev, offCfgReg);
                 if (f64Bit)
                 {
                     Assert(iRegion < VBOX_PCI_ROM_SLOT);
-                    uMemBase |= (uint64_t)ich9pciGetDWord(pPciDev, offCfgReg + 4) << 32;
+                    /* safe, only needs to go to the config space array */
+                    uMemBase |= (uint64_t)PDMPciDevGetDWord(pPciDev, offCfgReg + 4) << 32;
                 }
                 if (   iRegion != PCI_ROM_SLOT