Changeset 32951 in vbox for trunk/src

Timestamp:

Oct 6, 2010 3:03:32 PM (14 years ago)

Author:

vboxsync

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

66448

Message:

PCI: cleanup, bits

Location:

trunk/src/VBox/Devices

Files:

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

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

@@ -528 +528 @@
 static void ich9pciSetIrqInternal(PPCIGLOBALS pGlobals, uint8_t uDevFn, PPCIDEVICE pPciDev, int iIrq, int iLevel)
 {
-    if (MsiIsEnabled(pPciDev))
-    {
-        Log2(("Raise a MSI interrupt: %d\n", iIrq));
-        /* We only trigger MSI on level up, as technically it's matching flip-flop best (maybe even assert that level == PDM_IRQ_LEVEL_FLIP_FLOP) */
-        if ((iLevel & PDM_IRQ_LEVEL_HIGH) != 0)
-        {
-            PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
-            MsiNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq);
+
+    if (PCIDevIsIntxDisabled(pPciDev))
+    {
+        if (MsiIsEnabled(pPciDev))
+        {
+            Log2(("Raise a MSI interrupt: %d\n", iIrq));
+            /* We only trigger MSI on level up, as technically it's matching flip-flop best (maybe even assert that level == PDM_IRQ_LEVEL_FLIP_FLOP) */
+            if ((iLevel & PDM_IRQ_LEVEL_HIGH) != 0)
+            {
+                PPDMDEVINS pDevIns = pGlobals->aPciBus.CTX_SUFF(pDevIns);
+                MsiNotify(pDevIns, pGlobals->aPciBus.CTX_SUFF(pPciHlp), pPciDev, iIrq);
+            }
         }
         return;
@@ -569 +573 @@
     uint32_t u32 = 0;
 
+    PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
+
     ich9pciPhysToPciAddr(pGlobals, GCPhysAddr, &aDest);
 
-    PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
     switch (cb)
     {
@@ -597 +602 @@
     PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
     PciAddress  aDest;
-    uint32_t    rv = 0;
+    uint32_t    rv = 0xffffffff;
+
+    PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
 
     ich9pciPhysToPciAddr(pGlobals, GCPhysAddr, &aDest);
 
-    PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
     int rc = ich9pciDataReadAddr(pGlobals, &aDest, cb, &rv);
-    if (rc == VINF_SUCCESS)
-    {
-        switch (cb)
-        {
-            case 1:
-                *(uint8_t*)pv   = (uint8_t)rv;
-                break;
-            case 2:
-                *(uint16_t*)pv  = (uint16_t)rv;
-                break;
-            case 4:
-                *(uint32_t*)pv  = (uint32_t)rv;
-                break;
-            default:
-                Assert(false);
-                break;
-        }
+
+    switch (cb)
+    {
+        case 1:
+            *(uint8_t*)pv   = (uint8_t)rv;
+            break;
+        case 2:
+            *(uint16_t*)pv  = (uint16_t)rv;
+            break;
+        case 4:
+            *(uint32_t*)pv  = (uint32_t)rv;
+            break;
+        default:
+            Assert(false);
+            break;
     }
     PCI_UNLOCK(pDevIns);
@@ -1699 +1703 @@
             return PCIDevGetByte(aDev,  u32Address);
         case 2:
-            return PCIDevGetWord(aDev,  u32Address);        
+            return PCIDevGetWord(aDev,  u32Address);
         case 4:
             return PCIDevGetDWord(aDev, u32Address);
@@ -2263 +2267 @@
 }
 
+static void ich9pciResetDevice(PPCIDEVICE pDev)
+{
+    pDev->config[VBOX_PCI_COMMAND] &= ~(VBOX_PCI_COMMAND_IO | VBOX_PCI_COMMAND_MEMORY |
+                                        VBOX_PCI_COMMAND_MASTER);
+
+    if (!PCIIsPci2PciBridge(pDev))
+    {
+        pDev->config[VBOX_PCI_CACHE_LINE_SIZE] = 0x0;
+        pDev->config[VBOX_PCI_INTERRUPT_LINE] = 0x0;
+    }
+    /* Regions ? */
+}
+
+
+/**
+ * @copydoc FNPDMDEVRESET
+ */
+static DECLCALLBACK(void) ich9pciReset(PPDMDEVINS pDevIns)
+{
+    PPCIGLOBALS pGlobals = PDMINS_2_DATA(pDevIns, PPCIGLOBALS);
+    PPCIBUS     pBus     = &pGlobals->aPciBus;
+
+    /* Relocate RC pointers for the attached pci devices. */
+    for (uint32_t i = 0; i < RT_ELEMENTS(pBus->apDevices); i++)
+    {
+        if (pBus->apDevices[i])
+            ich9pciResetDevice(pBus->apDevices[i]);
+    }
+}
+
 /**
  * @copydoc FNPDMDEVRELOCATE
@@ -2473 +2507 @@
     NULL,
     /* pfnReset */
-    NULL,
+    ich9pciReset,
     /* pfnSuspend */
     NULL,

trunk/src/VBox/Devices/PC/vbox.dsl

@@ -556 +556 @@
                     APDE,   8,
                 }
-
+              
                 // PCI MCFG MMIO ranges
                 Device (^PCIE)
@@ -565 +565 @@
                     {
                         Memory32Fixed (ReadOnly,
-                            0xD0000000,         // Address Base
-                            0x10000000,         // Address Length
+                            0xdc000000,        // Address Base
+                            0x4000000,         // Address Length
                             _Y13)
                     })
@@ -586 +586 @@
                      }
                     }
-                }
+                }               
 
                 // Keyboard device