[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH 12/15] i440fx-pmc: calculate PCI memory hole directl
From: |
Anthony Liguori |
Subject: |
[Qemu-devel] [PATCH 12/15] i440fx-pmc: calculate PCI memory hole directly |
Date: |
Thu, 26 Jan 2012 13:00:57 -0600 |
---
hw/piix_pci.c | 47 +++++++++++++++++++++++++++++------------------
1 files changed, 29 insertions(+), 18 deletions(-)
diff --git a/hw/piix_pci.c b/hw/piix_pci.c
index dddc95f..b38904d 100644
--- a/hw/piix_pci.c
+++ b/hw/piix_pci.c
@@ -52,6 +52,9 @@
#define XEN_PIIX_NUM_PIRQS 128ULL
#define PIIX_PIRQC 0x60
+#define I440FX_PMC_PCI_HOLE 0xE0000000ULL
+#define I440FX_PMC_PCI_HOLE_END 0x100000000ULL
+
#define TYPE_PIIX3 "PIIX3"
#define PIIX3(obj) OBJECT_CHECK(PIIX3State, (obj), TYPE_PIIX3)
@@ -105,10 +108,6 @@ struct I440FXPMCState {
MemoryRegion smram_region;
uint8_t smm_enabled;
ram_addr_t ram_size;
- target_phys_addr_t pci_hole_start;
- target_phys_addr_t pci_hole_size;
- target_phys_addr_t pci_hole64_start;
- target_phys_addr_t pci_hole64_size;
};
#define TYPE_I440FX "i440FX"
@@ -285,6 +284,9 @@ static int i440fx_realize(SysBusDevice *dev)
sysbus_add_io(dev, 0xcfc, &h->data_mem);
sysbus_init_ioports(&h->busdev, 0xcfc, 4);
+ s->pmc.system_memory = h->address_space;
+ s->pmc.pci_address_space = s->pci_address_space;
+
qdev_set_parent_bus(DEVICE(&s->pmc), BUS(h->bus));
qdev_init_nofail(DEVICE(&s->pmc));
@@ -326,19 +328,37 @@ static int i440fx_pmc_initfn(PCIDevice *dev)
{
I440FXPMCState *d = DO_UPCAST(I440FXPMCState, dev, dev);
ram_addr_t ram_size;
+ uint64_t pci_hole_start, pci_hole_size;
+ uint64_t pci_hole64_start, pci_hole64_size;
+ g_assert(d->ram_size != 0);
g_assert(d->system_memory != NULL);
g_assert(d->pci_address_space != NULL);
g_assert(d->ram_memory != NULL);
+ /* Calculate PCI geometry from RAM size */
+ if (d->ram_size > I440FX_PMC_PCI_HOLE) {
+ pci_hole_start = I440FX_PMC_PCI_HOLE;
+ } else {
+ pci_hole_start = d->ram_size;
+ }
+ pci_hole_size = I440FX_PMC_PCI_HOLE_END - pci_hole_start;
+
+ pci_hole64_start = I440FX_PMC_PCI_HOLE_END + d->ram_size - pci_hole_start;
+ if (sizeof(target_phys_addr_t) == 4) {
+ pci_hole64_size = 0;
+ } else {
+ pci_hole64_size = (1ULL << 62);
+ }
+
memory_region_init_alias(&d->pci_hole, "pci-hole", d->pci_address_space,
- d->pci_hole_start, d->pci_hole_size);
- memory_region_add_subregion(d->system_memory, d->pci_hole_start,
&d->pci_hole);
+ pci_hole_start, pci_hole_size);
+ memory_region_add_subregion(d->system_memory, pci_hole_start,
&d->pci_hole);
memory_region_init_alias(&d->pci_hole_64bit, "pci-hole64",
d->pci_address_space,
- d->pci_hole64_start, d->pci_hole64_size);
- if (d->pci_hole64_size) {
- memory_region_add_subregion(d->system_memory, d->pci_hole64_start,
+ pci_hole64_start, pci_hole64_size);
+ if (pci_hole64_size) {
+ memory_region_add_subregion(d->system_memory, pci_hole64_start,
&d->pci_hole_64bit);
}
memory_region_init_alias(&d->smram_region, "smram-region",
@@ -385,18 +405,9 @@ PCIBus *i440fx_init(I440FXPMCState **pi440fx_state, int
*piix3_devfn,
s->piix3.pic = pic;
- s->pmc.system_memory = address_space_mem;
- s->pmc.pci_address_space = pci_address_space;
s->pmc.ram_memory = ram_memory;
-
s->pmc.ram_size = ram_size;
- /* FIXME these should be derived */
- s->pmc.pci_hole_start = pci_hole_start;
- s->pmc.pci_hole_size = pci_hole_size;
- s->pmc.pci_hole64_start = pci_hole64_start;
- s->pmc.pci_hole64_size = pci_hole64_size;
-
qdev_set_parent_bus(DEVICE(s), sysbus_get_default());
qdev_init_nofail(DEVICE(s));
--
1.7.4.1
- Re: [Qemu-devel] [PATCH 06/15] piix: create i8254 through composition, (continued)
[Qemu-devel] [PATCH 08/15] i440fx: introduce some saner naming conventions, Anthony Liguori, 2012/01/26
[Qemu-devel] [PATCH 13/15] i440fx: allocate MemoryRegion for pci memory space, Anthony Liguori, 2012/01/26
[Qemu-devel] [PATCH 12/15] i440fx-pmc: calculate PCI memory hole directly,
Anthony Liguori <=
[Qemu-devel] [PATCH 14/15] i440fx: move bios loading to i440fx, Anthony Liguori, 2012/01/26
[Qemu-devel] [PATCH 15/15] i440fx: move ram initialization into i440fx-pmc, Anthony Liguori, 2012/01/26
[Qemu-devel] [PATCH 11/15] i440fx-pmc: refactor to take properties for memory geometry, Anthony Liguori, 2012/01/26
Re: [Qemu-devel] [RFC 00/15] Refactor PC machine to take advantage of QOM, Peter Maydell, 2012/01/26