Changeset 64468 in vbox for trunk/src/VBox/Devices

Timestamp:

Oct 28, 2016 3:20:05 PM (8 years ago)

Author:

vboxsync

Message:

DevPci: Cleaning up ich9pciUpdateMappings and friends.

File:

• trunk/src/VBox/Devices/Bus/DevPCI.cpp (modified) (1 diff)

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

@@ -105 +105 @@
 #define PCI_MAX_LAT         0x3f    /* 8 bits */
 
-
-#ifdef IN_RING3
-
-#if 0
-static void pci_update_mappings(PDMPCIDEV *d)
-{
-    PDEVPCIBUS pBus = d->Int.s.CTX_SUFF(pBus);
-    PCIIORegion *r;
-    int cmd, i;
-    uint32_t last_addr, new_addr, config_ofs;
-
-    cmd = RT_LE2H_U16(*(uint16_t *)(d->abConfig + PCI_COMMAND));
-    for(i = 0; i < PCI_NUM_REGIONS; i++) {
-        r = &d->Int.s.aIORegions[i];
-        if (i == PCI_ROM_SLOT) {
-            config_ofs = 0x30;
-        } else {
-            config_ofs = 0x10 + i * 4;
-        }
-        if (r->size != 0) {
-            if (r->type & PCI_ADDRESS_SPACE_IO) {
-                if (cmd & PCI_COMMAND_IO) {
-                    new_addr = RT_LE2H_U32(*(uint32_t *)(d->abConfig +
-                                                         config_ofs));
-                    new_addr = new_addr & ~(r->size - 1);
-                    last_addr = new_addr + r->size - 1;
-                    /* NOTE: we have only 64K ioports on PC */
-                    if (last_addr <= new_addr || new_addr == 0 ||
-                        last_addr >= 0x10000) {
-                        new_addr = ~0U;
-                    }
-                } else {
-                    new_addr = ~0U;
-                }
-            } else {
-                if (cmd & PCI_COMMAND_MEMORY) {
-                    new_addr = RT_LE2H_U32(*(uint32_t *)(d->abConfig +
-                                                         config_ofs));
-                    /* the ROM slot has a specific enable bit */
-                    if (i == PCI_ROM_SLOT && !(new_addr & 1))
-                        goto no_mem_map;
-                    new_addr = new_addr & ~(r->size - 1);
-                    last_addr = new_addr + r->size - 1;
-                    /* NOTE: we do not support wrapping */
-                    /* XXX: as we cannot support really dynamic
-                       mappings, we handle specific values as invalid
-                       mappings. */
-                    /* Unconditionally exclude I/O-APIC/HPET/ROM. Pessimistic, but better than causing a mess. */
-                    if (last_addr <= new_addr || new_addr == 0 ||
-                        (new_addr <= ~0U && last_addr >= 0xfec00000U)) {
-                        new_addr = ~0U;
-                    }
-                } else {
-                no_mem_map:
-                    new_addr = ~0U;
-                }
-            }
-            //LogRel(("PCI: config dev %u/%u BAR%i uOld=%#018llx uNew=%#018llx size=%llu\n", d->uDevFn >> 3, d->uDevFn & 7, i, r->addr, new_addr, r->size));
-            /* now do the real mapping */
-            if (new_addr != r->addr) {
-                if (r->addr != ~0U) {
-                    if (r->type & PCI_ADDRESS_SPACE_IO) {
-                        int devclass;
-                        /* NOTE: specific hack for IDE in PC case:
-                           only one byte must be mapped. */
-                        devclass = d->abConfig[0x0a] | (d->abConfig[0x0b] << 8);
-                        if (devclass == 0x0101 && r->size == 4) {
-                            int rc = PDMDevHlpIOPortDeregister(d->Int.s.CTX_SUFF(pDevIns), r->addr + 2, 1);
-                            AssertRC(rc);
-                        } else {
-                            int rc = PDMDevHlpIOPortDeregister(d->Int.s.CTX_SUFF(pDevIns), r->addr, r->size);
-                            AssertRC(rc);
-                        }
-                    } else {
-                        RTGCPHYS GCPhysBase = r->addr;
-                        int rc;
-                        if (pBus->pPciHlpR3->pfnIsMMIOExBase(pBus->pDevInsR3, d->Int.s.CTX_SUFF(pDevIns), GCPhysBase))
-                        {
-                            /* unmap it. */
-                            rc = r->map_func(d->Int.s.pDevInsR3, d, i, NIL_RTGCPHYS, r->size, (PCIADDRESSSPACE)(r->type));
-                            AssertRC(rc);
-                            rc = PDMDevHlpMMIOExUnmap(d->Int.s.CTX_SUFF(pDevIns), d, i, GCPhysBase);
-                        }
-                        else
-                            rc = PDMDevHlpMMIODeregister(d->Int.s.CTX_SUFF(pDevIns), GCPhysBase, r->size);
-                        AssertMsgRC(rc, ("rc=%Rrc d=%s i=%d GCPhysBase=%RGp size=%#x\n", rc, d->pszNameR3, i, GCPhysBase, r->size));
-                    }
-                }
-                r->addr = new_addr;
-                if (r->addr != ~0U) {
-                    int rc = r->map_func(d->Int.s.pDevInsR3, d, i,
-                                         r->addr + (r->type & PCI_ADDRESS_SPACE_IO ? 0 : 0),
-                                         r->size, (PCIADDRESSSPACE)(r->type));
-                    AssertRC(rc);
-                }
-            }
-        }
-    }
-}
-#endif
-
-#endif /* IN_RING3 */
 
 static int pci_data_write(PDEVPCIROOT pGlobals, uint32_t addr, uint32_t val, int len)