ShuriZma
/
xemu
mirror of https://github.com/xemu-project/xemu.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

acpi: refactor pxb crs computation 

Instead of always passing both IO and MEM ranges when
computing CRS ranges, define a new CrsRangeSet structure
that include them both.

This is done before introducing a third type of range,
64-bit MEM, so it will be easier to pass them all around.

Reviewed-by: Igor Mammedov <imammedo@redhat.com>
Signed-off-by: Marcel Apfelbaum <marcel@redhat.com>
Tested-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Michael S. Tsirkin <mst@redhat.com>
Signed-off-by: Michael S. Tsirkin <mst@redhat.com>
This commit is contained in:
Marcel Apfelbaum 2016-07-17 19:53:12 +03:00 committed by Michael S. Tsirkin
parent c99cb18eeb
commit 2df5a7b52f
1 changed files with 50 additions and 31 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

81
hw/i386/acpi-build.c
View File

@ -751,6 +751,23 @@ static void crs_range_free(gpointer data)
g_free(entry); g_free(entry);
} }
typedef struct CrsRangeSet {
GPtrArray *io_ranges;
GPtrArray *mem_ranges;
} CrsRangeSet;
static void crs_range_set_init(CrsRangeSet *range_set)
{
range_set->io_ranges = g_ptr_array_new_with_free_func(crs_range_free);
range_set->mem_ranges = g_ptr_array_new_with_free_func(crs_range_free);
}
static void crs_range_set_free(CrsRangeSet *range_set)
{
g_ptr_array_free(range_set->io_ranges, true);
g_ptr_array_free(range_set->mem_ranges, true);
}
static gint crs_range_compare(gconstpointer a, gconstpointer b) static gint crs_range_compare(gconstpointer a, gconstpointer b)
{ {
CrsRangeEntry *entry_a = *(CrsRangeEntry **)a; CrsRangeEntry *entry_a = *(CrsRangeEntry **)a;
@ -835,18 +852,17 @@ static void crs_range_merge(GPtrArray *range)
g_ptr_array_free(tmp, true); g_ptr_array_free(tmp, true);
} }
static Aml *build_crs(PCIHostState *host, static Aml *build_crs(PCIHostState *host, CrsRangeSet *range_set)
GPtrArray *io_ranges, GPtrArray *mem_ranges)
{ {
Aml *crs = aml_resource_template(); Aml *crs = aml_resource_template();
GPtrArray *host_io_ranges = g_ptr_array_new_with_free_func(crs_range_free); CrsRangeSet temp_range_set;
GPtrArray *host_mem_ranges = g_ptr_array_new_with_free_func(crs_range_free);
CrsRangeEntry *entry; CrsRangeEntry *entry;
uint8_t max_bus = pci_bus_num(host->bus); uint8_t max_bus = pci_bus_num(host->bus);
uint8_t type; uint8_t type;
int devfn; int devfn;
int i; int i;
crs_range_set_init(&temp_range_set);
for (devfn = 0; devfn < ARRAY_SIZE(host->bus->devices); devfn++) { for (devfn = 0; devfn < ARRAY_SIZE(host->bus->devices); devfn++) {
uint64_t range_base, range_limit; uint64_t range_base, range_limit;
PCIDevice *dev = host->bus->devices[devfn]; PCIDevice *dev = host->bus->devices[devfn];
@ -870,9 +886,11 @@ static Aml *build_crs(PCIHostState *host,
} }
if (r->type & PCI_BASE_ADDRESS_SPACE_IO) { if (r->type & PCI_BASE_ADDRESS_SPACE_IO) {
crs_range_insert(host_io_ranges, range_base, range_limit); crs_range_insert(temp_range_set.io_ranges,
range_base, range_limit);
} else { /* "memory" */ } else { /* "memory" */
crs_range_insert(host_mem_ranges, range_base, range_limit); crs_range_insert(temp_range_set.mem_ranges,
range_base, range_limit);
} }
} }
@ -891,7 +909,8 @@ static Aml *build_crs(PCIHostState *host,
* that do not support multiple root buses * that do not support multiple root buses
*/ */
if (range_base && range_base <= range_limit) { if (range_base && range_base <= range_limit) {
crs_range_insert(host_io_ranges, range_base, range_limit); crs_range_insert(temp_range_set.io_ranges,
range_base, range_limit);
} }
range_base = range_base =
@ -904,7 +923,8 @@ static Aml *build_crs(PCIHostState *host,
* that do not support multiple root buses * that do not support multiple root buses
*/ */
if (range_base && range_base <= range_limit) { if (range_base && range_base <= range_limit) {
crs_range_insert(host_mem_ranges, range_base, range_limit); crs_range_insert(temp_range_set.mem_ranges,
range_base, range_limit);
} }
range_base = range_base =
@ -917,35 +937,36 @@ static Aml *build_crs(PCIHostState *host,
* that do not support multiple root buses * that do not support multiple root buses
*/ */
if (range_base && range_base <= range_limit) { if (range_base && range_base <= range_limit) {
crs_range_insert(host_mem_ranges, range_base, range_limit); crs_range_insert(temp_range_set.mem_ranges,
range_base, range_limit);
} }
} }
} }
crs_range_merge(host_io_ranges); crs_range_merge(temp_range_set.io_ranges);
for (i = 0; i < host_io_ranges->len; i++) { for (i = 0; i < temp_range_set.io_ranges->len; i++) {
entry = g_ptr_array_index(host_io_ranges, i); entry = g_ptr_array_index(temp_range_set.io_ranges, i);
aml_append(crs, aml_append(crs,
aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED, aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED,
AML_POS_DECODE, AML_ENTIRE_RANGE, AML_POS_DECODE, AML_ENTIRE_RANGE,
0, entry->base, entry->limit, 0, 0, entry->base, entry->limit, 0,
entry->limit - entry->base + 1)); entry->limit - entry->base + 1));
crs_range_insert(io_ranges, entry->base, entry->limit); crs_range_insert(range_set->io_ranges, entry->base, entry->limit);
} }
g_ptr_array_free(host_io_ranges, true);
crs_range_merge(host_mem_ranges); crs_range_merge(temp_range_set.mem_ranges);
for (i = 0; i < host_mem_ranges->len; i++) { for (i = 0; i < temp_range_set.mem_ranges->len; i++) {
entry = g_ptr_array_index(host_mem_ranges, i); entry = g_ptr_array_index(temp_range_set.mem_ranges, i);
aml_append(crs, aml_append(crs,
aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED,
AML_MAX_FIXED, AML_NON_CACHEABLE, AML_MAX_FIXED, AML_NON_CACHEABLE,
AML_READ_WRITE, AML_READ_WRITE,
0, entry->base, entry->limit, 0, 0, entry->base, entry->limit, 0,
entry->limit - entry->base + 1)); entry->limit - entry->base + 1));
crs_range_insert(mem_ranges, entry->base, entry->limit); crs_range_insert(range_set->mem_ranges, entry->base, entry->limit);
} }
g_ptr_array_free(host_mem_ranges, true);
crs_range_set_free(&temp_range_set);
aml_append(crs, aml_append(crs,
aml_word_bus_number(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE, aml_word_bus_number(AML_MIN_FIXED, AML_MAX_FIXED, AML_POS_DECODE,
@ -1902,8 +1923,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
{ {
CrsRangeEntry *entry; CrsRangeEntry *entry;
Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs; Aml *dsdt, *sb_scope, *scope, *dev, *method, *field, *pkg, *crs;
GPtrArray *mem_ranges = g_ptr_array_new_with_free_func(crs_range_free); CrsRangeSet crs_range_set;
GPtrArray *io_ranges = g_ptr_array_new_with_free_func(crs_range_free);
PCMachineState *pcms = PC_MACHINE(machine); PCMachineState *pcms = PC_MACHINE(machine);
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine); PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(machine);
uint32_t nr_mem = machine->ram_slots; uint32_t nr_mem = machine->ram_slots;
@ -1992,6 +2012,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
} }
aml_append(dsdt, scope); aml_append(dsdt, scope);
crs_range_set_init(&crs_range_set);
bus = PC_MACHINE(machine)->bus; bus = PC_MACHINE(machine)->bus;
if (bus) { if (bus) {
QLIST_FOREACH(bus, &bus->child, sibling) { QLIST_FOREACH(bus, &bus->child, sibling) {
@ -2018,8 +2039,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
} }
aml_append(dev, build_prt(false)); aml_append(dev, build_prt(false));
crs = build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), crs = build_crs(PCI_HOST_BRIDGE(BUS(bus)->parent), &crs_range_set);
io_ranges, mem_ranges);
aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(scope, dev); aml_append(scope, dev);
aml_append(dsdt, scope); aml_append(dsdt, scope);
@ -2040,9 +2060,9 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
AML_POS_DECODE, AML_ENTIRE_RANGE, AML_POS_DECODE, AML_ENTIRE_RANGE,
0x0000, 0x0000, 0x0CF7, 0x0000, 0x0CF8)); 0x0000, 0x0000, 0x0CF7, 0x0000, 0x0CF8));
crs_replace_with_free_ranges(io_ranges, 0x0D00, 0xFFFF); crs_replace_with_free_ranges(crs_range_set.io_ranges, 0x0D00, 0xFFFF);
for (i = 0; i < io_ranges->len; i++) { for (i = 0; i < crs_range_set.io_ranges->len; i++) {
entry = g_ptr_array_index(io_ranges, i); entry = g_ptr_array_index(crs_range_set.io_ranges, i);
aml_append(crs, aml_append(crs,
aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED, aml_word_io(AML_MIN_FIXED, AML_MAX_FIXED,
AML_POS_DECODE, AML_ENTIRE_RANGE, AML_POS_DECODE, AML_ENTIRE_RANGE,
@ -2055,11 +2075,11 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
AML_CACHEABLE, AML_READ_WRITE, AML_CACHEABLE, AML_READ_WRITE,
0, 0x000A0000, 0x000BFFFF, 0, 0x00020000)); 0, 0x000A0000, 0x000BFFFF, 0, 0x00020000));
crs_replace_with_free_ranges(mem_ranges, crs_replace_with_free_ranges(crs_range_set.mem_ranges,
range_lob(pci_hole), range_lob(pci_hole),
range_upb(pci_hole)); range_upb(pci_hole));
for (i = 0; i < mem_ranges->len; i++) { for (i = 0; i < crs_range_set.mem_ranges->len; i++) {
entry = g_ptr_array_index(mem_ranges, i); entry = g_ptr_array_index(crs_range_set.mem_ranges, i);
aml_append(crs, aml_append(crs,
aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED, aml_dword_memory(AML_POS_DECODE, AML_MIN_FIXED, AML_MAX_FIXED,
AML_NON_CACHEABLE, AML_READ_WRITE, AML_NON_CACHEABLE, AML_READ_WRITE,
@ -2094,8 +2114,7 @@ build_dsdt(GArray *table_data, BIOSLinker *linker,
aml_append(dev, aml_name_decl("_CRS", crs)); aml_append(dev, aml_name_decl("_CRS", crs));
aml_append(scope, dev); aml_append(scope, dev);
g_ptr_array_free(io_ranges, true); crs_range_set_free(&crs_range_set);
g_ptr_array_free(mem_ranges, true);
/* reserve PCIHP resources */ /* reserve PCIHP resources */
if (pm->pcihp_io_len) { if (pm->pcihp_io_len) {