[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v3 for-2.3 11/24] hw/acpi: add _CRS method for extra
From: |
Marcel Apfelbaum |
Subject: |
[Qemu-devel] [PATCH v3 for-2.3 11/24] hw/acpi: add _CRS method for extra root busses |
Date: |
Thu, 5 Mar 2015 16:55:09 +0200 |
Save the IO/mem/bus numbers ranges assigned to the extra root busses
to be removed from the root bus 0 range.
Signed-off-by: Marcel Apfelbaum <address@hidden>
---
hw/i386/acpi-build.c | 149 +++++++++++++++++++++++++++++++++++++++++++++++++++
1 file changed, 149 insertions(+)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index f0401d2..71d815d 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -741,6 +741,148 @@ static Aml *build_prt(void)
return method;
}
+typedef struct PciRangeEntry {
+ QLIST_ENTRY(PciRangeEntry) entry;
+ int64_t base;
+ int64_t limit;
+} PciRangeEntry;
+
+typedef QLIST_HEAD(PciRangeQ, PciRangeEntry) PciRangeQ;
+
+static void pci_range_insert(PciRangeQ *list, int64_t base, int64_t limit)
+{
+ PciRangeEntry *entry, *next, *e;
+
+ if (!base) {
+ return;
+ }
+
+ e = g_malloc(sizeof(*entry));
+ e->base = base;
+ e->limit = limit;
+
+ if (QLIST_EMPTY(list)) {
+ QLIST_INSERT_HEAD(list, e, entry);
+ } else {
+ QLIST_FOREACH_SAFE(entry, list, entry, next) {
+ if (base < entry->base) {
+ QLIST_INSERT_BEFORE(entry, e, entry);
+ break;
+ } else if (!next) {
+ QLIST_INSERT_AFTER(entry, e, entry);
+ break;
+ }
+ }
+ }
+}
+
+static void pci_range_list_free(PciRangeQ *list)
+{
+ PciRangeEntry *entry, *next;
+
+ QLIST_FOREACH_SAFE(entry, list, entry, next) {
+ QLIST_REMOVE(entry, entry);
+ g_free(entry);
+ }
+}
+
+static Aml *build_crs(PcPciInfo *pci, PciInfo *bus_info,
+ PciRangeQ *io_ranges, PciRangeQ *mem_ranges)
+{
+ PciDeviceInfoList *dev_list;
+ PciMemoryRange range;
+ uint8_t max_bus;
+ Aml *crs;
+
+ crs = aml_resource_template();
+ max_bus = bus_info->bus;
+
+ for (dev_list = bus_info->devices; dev_list; dev_list = dev_list->next) {
+ PciMemoryRegionList *region;
+
+ for (region = dev_list->value->regions; region; region = region->next)
{
+ range.base = region->value->address;
+ range.limit = region->value->address + region->value->size - 1;
+
+ if (!strcmp(region->value->type, "io")) {
+ aml_append(crs,
+ aml_word_io(aml_min_fixed, aml_max_fixed,
+ aml_pos_decode, aml_entire_range,
+ 0,
+ range.base,
+ range.limit,
+ 0,
+ range.limit - range.base + 1));
+ pci_range_insert(io_ranges, range.base, range.limit);
+ } else { /* "memory" */
+ aml_append(crs,
+ aml_dword_memory(aml_pos_decode, aml_min_fixed,
+ aml_max_fixed, aml_non_cacheable,
+ aml_ReadWrite,
+ 0,
+ range.base,
+ range.limit,
+ 0,
+ range.limit - range.base + 1));
+ pci_range_insert(mem_ranges, range.base, range.limit);
+ }
+ }
+
+ if (dev_list->value->has_pci_bridge) {
+ PciBridgeInfo *bridge_info = dev_list->value->pci_bridge;
+
+ if (bridge_info->bus.subordinate > max_bus) {
+ max_bus = bridge_info->bus.subordinate;
+ }
+
+ range = *bridge_info->bus.io_range;
+ aml_append(crs,
+ aml_word_io(aml_min_fixed, aml_max_fixed,
+ aml_pos_decode, aml_entire_range,
+ 0,
+ range.base,
+ range.limit,
+ 0,
+ range.limit - range.base + 1));
+ pci_range_insert(io_ranges, range.base, range.limit);
+
+ range = *bridge_info->bus.memory_range;
+ aml_append(crs,
+ aml_dword_memory(aml_pos_decode, aml_min_fixed,
+ aml_max_fixed, aml_non_cacheable,
+ aml_ReadWrite,
+ 0,
+ range.base,
+ range.limit,
+ 0,
+ range.limit - range.base + 1));
+ pci_range_insert(mem_ranges, range.base, range.limit);
+
+ range = *bridge_info->bus.prefetchable_range;
+ aml_append(crs,
+ aml_dword_memory(aml_pos_decode, aml_min_fixed,
+ aml_max_fixed, aml_non_cacheable,
+ aml_ReadWrite,
+ 0,
+ range.base,
+ range.limit,
+ 0,
+ range.limit - range.base + 1));
+ pci_range_insert(mem_ranges, range.base, range.limit);
+ }
+ }
+
+ aml_append(crs,
+ aml_word_bus_number(aml_min_fixed, aml_max_fixed, aml_pos_decode,
+ 0,
+ bus_info->bus,
+ max_bus,
+ 0,
+ max_bus - bus_info->bus + 1));
+
+ return crs;
+}
+
static void
build_ssdt(GArray *table_data, GArray *linker,
AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc,
@@ -750,6 +892,8 @@ build_ssdt(GArray *table_data, GArray *linker,
uint32_t nr_mem = machine->ram_slots;
unsigned acpi_cpus = guest_info->apic_id_limit;
Aml *ssdt, *sb_scope, *scope, *pkg, *dev, *method, *crs, *field, *ifctx;
+ PciRangeQ io_ranges = QLIST_HEAD_INITIALIZER(io_ranges);
+ PciRangeQ mem_ranges = QLIST_HEAD_INITIALIZER(mem_ranges);
int i;
ssdt = init_aml_allocator();
@@ -786,9 +930,14 @@ build_ssdt(GArray *table_data, GArray *linker,
aml_append(dev,
aml_name_decl("_BBN", aml_int((uint8_t)bus_info->bus)));
aml_append(dev, build_prt());
+ crs = build_crs(pci, bus_info, &io_ranges, &mem_ranges);
+ aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(scope, dev);
aml_append(ssdt, scope);
}
+
+ pci_range_list_free(&io_ranges);
+ pci_range_list_free(&mem_ranges);
qapi_free_PciInfoList(info_list);
}
--
2.1.0
- [Qemu-devel] [PATCH v3 for-2.3 14/24] hw/pci: made pci_bus_is_root a PCIBusClass method, (continued)
- [Qemu-devel] [PATCH v3 for-2.3 14/24] hw/pci: made pci_bus_is_root a PCIBusClass method, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 13/24] hw/pci: move pci bus related code to separate files, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 17/24] hw/pci: removed 'rootbus nr is 0' assumption from qmp_pci_query, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 16/24] hw/pci: introduce TYPE_PCI_MAIN_HOST_BRIDGE interface, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 18/24] hw/pci: implement iteration over multiple host bridges, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 20/24] hw/pci: inform bios if the system has more than one pci bridge, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 21/24] hw/pci: piix - suport multiple host bridges, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 22/24] hw/pxb: add map_irq func, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 24/24] hw/pxb: add numa_node parameter, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 12/24] hw/acpi: remove from root bus 0 the crs resources used by other busses., Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 11/24] hw/acpi: add _CRS method for extra root busses,
Marcel Apfelbaum <=
- [Qemu-devel] [PATCH v3 for-2.3 19/24] hw/pci: introduce PCI Expander Bridge (PXB), Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 23/24] hw/pci_bus: add support for NUMA nodes, Marcel Apfelbaum, 2015/03/05
- [Qemu-devel] [PATCH v3 for-2.3 15/24] hw/pci: made pci_bus_num a PCIBusClass method, Marcel Apfelbaum, 2015/03/05