[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 44/52] pc: pcihp: expose MMIO base and len as pro
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v3 44/52] pc: pcihp: expose MMIO base and len as properties |
Date: |
Mon, 9 Feb 2015 10:54:06 +0000 |
it will be used later to dynamically reserve MMIO region
instead of manually punching holes in PCI0._CRS
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/acpi/pcihp.c | 18 ++++++++++++------
hw/acpi/piix4.c | 2 +-
include/hw/acpi/pcihp.h | 7 ++++++-
3 files changed, 19 insertions(+), 8 deletions(-)
diff --git a/hw/acpi/pcihp.c b/hw/acpi/pcihp.c
index 34dedf1..612fec0 100644
--- a/hw/acpi/pcihp.c
+++ b/hw/acpi/pcihp.c
@@ -297,10 +297,11 @@ static const MemoryRegionOps acpi_pcihp_io_ops = {
},
};
-void acpi_pcihp_init(AcpiPciHpState *s, PCIBus *root_bus,
+void acpi_pcihp_init(Object *owner, AcpiPciHpState *s, PCIBus *root_bus,
MemoryRegion *address_space_io, bool bridges_enabled)
{
- uint16_t io_size = ACPI_PCIHP_SIZE;
+ s->io_len = ACPI_PCIHP_SIZE;
+ s->io_base = ACPI_PCIHP_ADDR;
s->root= root_bus;
s->legacy_piix = !bridges_enabled;
@@ -308,16 +309,21 @@ void acpi_pcihp_init(AcpiPciHpState *s, PCIBus *root_bus,
if (s->legacy_piix) {
unsigned *bus_bsel = g_malloc(sizeof *bus_bsel);
- io_size = ACPI_PCIHP_LEGACY_SIZE;
+ s->io_len = ACPI_PCIHP_LEGACY_SIZE;
*bus_bsel = ACPI_PCIHP_BSEL_DEFAULT;
object_property_add_uint32_ptr(OBJECT(root_bus), ACPI_PCIHP_PROP_BSEL,
bus_bsel, NULL);
}
- memory_region_init_io(&s->io, NULL, &acpi_pcihp_io_ops, s,
- "acpi-pci-hotplug", io_size);
- memory_region_add_subregion(address_space_io, ACPI_PCIHP_ADDR, &s->io);
+ memory_region_init_io(&s->io, owner, &acpi_pcihp_io_ops, s,
+ "acpi-pci-hotplug", s->io_len);
+ memory_region_add_subregion(address_space_io, s->io_base, &s->io);
+
+ object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_BASE_PROP, &s->io_base,
+ &error_abort);
+ object_property_add_uint16_ptr(owner, ACPI_PCIHP_IO_LEN_PROP, &s->io_len,
+ &error_abort);
}
const VMStateDescription vmstate_acpi_pcihp_pci_status = {
diff --git a/hw/acpi/piix4.c b/hw/acpi/piix4.c
index 766f1b8..d1f1179 100644
--- a/hw/acpi/piix4.c
+++ b/hw/acpi/piix4.c
@@ -562,7 +562,7 @@ static void piix4_acpi_system_hot_add_init(MemoryRegion
*parent,
"acpi-gpe0", GPE_LEN);
memory_region_add_subregion(parent, GPE_BASE, &s->io_gpe);
- acpi_pcihp_init(&s->acpi_pci_hotplug, bus, parent,
+ acpi_pcihp_init(OBJECT(s), &s->acpi_pci_hotplug, bus, parent,
s->use_acpi_pci_hotplug);
acpi_cpu_hotplug_init(parent, OBJECT(s), &s->gpe_cpu,
diff --git a/include/hw/acpi/pcihp.h b/include/hw/acpi/pcihp.h
index 9323838..f3526d4 100644
--- a/include/hw/acpi/pcihp.h
+++ b/include/hw/acpi/pcihp.h
@@ -32,6 +32,9 @@
#include "hw/acpi/acpi.h"
#include "migration/vmstate.h"
+#define ACPI_PCIHP_IO_BASE_PROP "acpi-pcihp-io-base"
+#define ACPI_PCIHP_IO_LEN_PROP "acpi-pcihp-io-len"
+
typedef struct AcpiPciHpPciStatus {
uint32_t up;
uint32_t down;
@@ -48,9 +51,11 @@ typedef struct AcpiPciHpState {
PCIBus *root;
MemoryRegion io;
bool legacy_piix;
+ uint16_t io_base;
+ uint16_t io_len;
} AcpiPciHpState;
-void acpi_pcihp_init(AcpiPciHpState *, PCIBus *root,
+void acpi_pcihp_init(Object *owner, AcpiPciHpState *, PCIBus *root,
MemoryRegion *address_space_io, bool bridges_enabled);
void acpi_pcihp_device_plug_cb(ACPIREGS *ar, qemu_irq irq, AcpiPciHpState *s,
--
1.8.3.1
- [Qemu-devel] [PATCH v3 34/52] acpi: add aml_varpackage() term, (continued)
- [Qemu-devel] [PATCH v3 34/52] acpi: add aml_varpackage() term, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 36/52] acpi: add aml_processor() term, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 26/52] acpi: add aml_resource_template() helper, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 35/52] acpi: add aml_equal() term, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 37/52] acpi: add aml_eisaid() term, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 38/52] pc: acpi-build: drop template patching and CPU hotplug objects dynamically, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 40/52] acpi: add aml_reserved_field() term, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 41/52] pc: acpi-build: drop template patching and memory hotplug objects dynamically, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 43/52] acpi: add aml_word_bus_number(), aml_word_io(), aml_dword_memory(), aml_qword_memory() terms, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 32/52] acpi: add aml_string() term, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 44/52] pc: pcihp: expose MMIO base and len as properties,
Igor Mammedov <=
- [Qemu-devel] [PATCH v3 47/52] pc: acpi-build: drop remaining ssdt_misc template and use acpi_def_block(), Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 42/52] pc: acpi-build: create memory hotplug IO region dynamically, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 52/52] acpi: make build_*() routines static to aml-build.c, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 46/52] pc: acpi-build: create PCI0._CRS dynamically, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 33/52] pc: acpi-build: generate pvpanic device description dynamically, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 45/52] pc: acpi-build: reserve PCIHP MMIO resources, Igor Mammedov, 2015/02/09
- [Qemu-devel] [PATCH v3 51/52] pc: acpi-build: update [q35-]acpi-dsdt.hex.generated due to moved SMC, Igor Mammedov, 2015/02/09