Changeset 32765 in vbox for trunk/src/VBox/Devices/Bus

Timestamp:

Sep 24, 2010 4:26:32 PM (14 years ago)

Author:

vboxsync

Message:

PCI: Linux guests really access extended PCI space

File:

• trunk/src/VBox/Devices/Bus/DevPciIch9.cpp (modified) (7 diffs)

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

@@ -184 +184 @@
 // See 7.2.2. PCI Express Enhanced Configuration Mechanism for details of address
 // mapping, we take n=8 approach
-DECLINLINE(void) ich9pciPhysToPciAddr(RTGCPHYS GCPhysAddr, PciAddress* pPciAddr)
-{
+DECLINLINE(void) ich9pciPhysToPciAddr(PPCIGLOBALS pGlobals, RTGCPHYS GCPhysAddr, PciAddress* pPciAddr)
+{
+    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
@@ -288 +289 @@
 static int ich9pciDataWriteAddr(PPCIGLOBALS pGlobals, PciAddress* pAddr, uint32_t val, int len)
 {
+
+    if (pAddr->iRegister > 0xff)
+    {
+        LogRel(("PCI: attempt to write extended register: %x (%d) <- val\n", pAddr->iRegister, len, val));
+        return 0;
+    }
+
     if (pAddr->iBus != 0)
     {
@@ -367 +375 @@
 static int ich9pciDataReadAddr(PPCIGLOBALS pGlobals, PciAddress* pPciAddr, int len, uint32_t *pu32)
 {
+    if (pPciAddr->iRegister > 0xff)
+    {
+        LogRel(("PCI: attempt to read extended register: %x\n", pPciAddr->iRegister));
+        *pu32 = 0;
+        return 0;
+    }
+
+
     if (pPciAddr->iBus != 0)
     {
@@ -536 +552 @@
     uint32_t u32 = 0;
 
-    ich9pciPhysToPciAddr(GCPhysAddr, &aDest);
+    ich9pciPhysToPciAddr(pGlobals, GCPhysAddr, &aDest);
 
     PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
@@ -556 +572 @@
     int rc = ich9pciDataWriteAddr(pGlobals, &aDest, u32, cb);
     PCI_UNLOCK(pDevIns);
-    Assert(false);
 
     return rc;
@@ -567 +582 @@
     uint32_t    rv = 0;
 
-    ich9pciPhysToPciAddr(GCPhysAddr, &aDest);
+    ich9pciPhysToPciAddr(pGlobals, GCPhysAddr, &aDest);
 
     PCI_LOCK(pDevIns, VINF_IOM_HC_IOPORT_WRITE);
@@ -591 +606 @@
     PCI_UNLOCK(pDevIns);
 
-    Assert(false);
     return rc;
 }