mirror of https://github.com/xemu-project/xemu.git
pc: acpi: drop cpu->found_cpus bitmap
cpu->found_cpus bitmap is used for setting present flag in CPON AML package. But it takes a bunch of code to fill bitmap and could be simplified by getting presense info from possible CPUs list directly. So drop cpu->found_cpus bitmap and unroll possible CPUs list into APIC index array at the place where CPUON AML package is created. Signed-off-by: Igor Mammedov <imammedo@redhat.com> Reviewed-by: Michael S. Tsirkin <mst@redhat.com> Signed-off-by: Michael S. Tsirkin <mst@redhat.com> Reviewed-by: Marcel Apfelbaum <marcel@redhat.com>
This commit is contained in:
parent
2adba0a18a
commit
adcb89d55d
|
@ -76,10 +76,6 @@
|
||||||
#define ACPI_BUILD_DPRINTF(fmt, ...)
|
#define ACPI_BUILD_DPRINTF(fmt, ...)
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
typedef struct AcpiCpuInfo {
|
|
||||||
DECLARE_BITMAP(found_cpus, ACPI_CPU_HOTPLUG_ID_LIMIT);
|
|
||||||
} AcpiCpuInfo;
|
|
||||||
|
|
||||||
typedef struct AcpiMcfgInfo {
|
typedef struct AcpiMcfgInfo {
|
||||||
uint64_t mcfg_base;
|
uint64_t mcfg_base;
|
||||||
uint32_t mcfg_size;
|
uint32_t mcfg_size;
|
||||||
|
@ -121,31 +117,6 @@ typedef struct AcpiBuildPciBusHotplugState {
|
||||||
bool pcihp_bridge_en;
|
bool pcihp_bridge_en;
|
||||||
} AcpiBuildPciBusHotplugState;
|
} AcpiBuildPciBusHotplugState;
|
||||||
|
|
||||||
static
|
|
||||||
int acpi_add_cpu_info(Object *o, void *opaque)
|
|
||||||
{
|
|
||||||
AcpiCpuInfo *cpu = opaque;
|
|
||||||
uint64_t apic_id;
|
|
||||||
|
|
||||||
if (object_dynamic_cast(o, TYPE_CPU)) {
|
|
||||||
apic_id = object_property_get_int(o, "apic-id", NULL);
|
|
||||||
assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT);
|
|
||||||
|
|
||||||
set_bit(apic_id, cpu->found_cpus);
|
|
||||||
}
|
|
||||||
|
|
||||||
object_child_foreach(o, acpi_add_cpu_info, opaque);
|
|
||||||
return 0;
|
|
||||||
}
|
|
||||||
|
|
||||||
static void acpi_get_cpu_info(AcpiCpuInfo *cpu)
|
|
||||||
{
|
|
||||||
Object *root = object_get_root();
|
|
||||||
|
|
||||||
memset(cpu->found_cpus, 0, sizeof cpu->found_cpus);
|
|
||||||
object_child_foreach(root, acpi_add_cpu_info, cpu);
|
|
||||||
}
|
|
||||||
|
|
||||||
static void acpi_get_pm_info(AcpiPmInfo *pm)
|
static void acpi_get_pm_info(AcpiPmInfo *pm)
|
||||||
{
|
{
|
||||||
Object *piix = piix4_pm_find();
|
Object *piix = piix4_pm_find();
|
||||||
|
@ -966,9 +937,9 @@ static Aml *build_crs(PCIHostState *host,
|
||||||
}
|
}
|
||||||
|
|
||||||
static void build_processor_devices(Aml *sb_scope, MachineState *machine,
|
static void build_processor_devices(Aml *sb_scope, MachineState *machine,
|
||||||
AcpiCpuInfo *cpu, AcpiPmInfo *pm)
|
AcpiPmInfo *pm)
|
||||||
{
|
{
|
||||||
int i;
|
int i, apic_idx;
|
||||||
Aml *dev;
|
Aml *dev;
|
||||||
Aml *crs;
|
Aml *crs;
|
||||||
Aml *pkg;
|
Aml *pkg;
|
||||||
|
@ -1011,6 +982,7 @@ static void build_processor_devices(Aml *sb_scope, MachineState *machine,
|
||||||
int apic_id = apic_ids->cpus[i].arch_id;
|
int apic_id = apic_ids->cpus[i].arch_id;
|
||||||
|
|
||||||
assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT);
|
assert(apic_id < ACPI_CPU_HOTPLUG_ID_LIMIT);
|
||||||
|
|
||||||
dev = aml_processor(apic_id, 0, 0, "CP%.02X", apic_id);
|
dev = aml_processor(apic_id, 0, 0, "CP%.02X", apic_id);
|
||||||
|
|
||||||
method = aml_method("_MAT", 0, AML_NOTSERIALIZED);
|
method = aml_method("_MAT", 0, AML_NOTSERIALIZED);
|
||||||
|
@ -1059,9 +1031,14 @@ static void build_processor_devices(Aml *sb_scope, MachineState *machine,
|
||||||
pkg = pcms->apic_id_limit <= 255 ? aml_package(pcms->apic_id_limit) :
|
pkg = pcms->apic_id_limit <= 255 ? aml_package(pcms->apic_id_limit) :
|
||||||
aml_varpackage(pcms->apic_id_limit);
|
aml_varpackage(pcms->apic_id_limit);
|
||||||
|
|
||||||
for (i = 0; i < pcms->apic_id_limit; i++) {
|
for (i = 0, apic_idx = 0; i < apic_ids->len; i++) {
|
||||||
uint8_t b = test_bit(i, cpu->found_cpus) ? 0x01 : 0x00;
|
int apic_id = apic_ids->cpus[i].arch_id;
|
||||||
aml_append(pkg, aml_int(b));
|
|
||||||
|
for (; apic_idx < apic_id; apic_idx++) {
|
||||||
|
aml_append(pkg, aml_int(0));
|
||||||
|
}
|
||||||
|
aml_append(pkg, aml_int(apic_ids->cpus[i].cpu ? 1 : 0));
|
||||||
|
apic_idx = apic_id + 1;
|
||||||
}
|
}
|
||||||
aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg));
|
aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg));
|
||||||
g_free(apic_ids);
|
g_free(apic_ids);
|
||||||
|
@ -2000,7 +1977,7 @@ static Aml *build_q35_osc_method(void)
|
||||||
|
|
||||||
static void
|
static void
|
||||||
build_dsdt(GArray *table_data, GArray *linker,
|
build_dsdt(GArray *table_data, GArray *linker,
|
||||||
AcpiCpuInfo *cpu, AcpiPmInfo *pm, AcpiMiscInfo *misc,
|
AcpiPmInfo *pm, AcpiMiscInfo *misc,
|
||||||
PcPciInfo *pci, MachineState *machine)
|
PcPciInfo *pci, MachineState *machine)
|
||||||
{
|
{
|
||||||
CrsRangeEntry *entry;
|
CrsRangeEntry *entry;
|
||||||
|
@ -2337,7 +2314,7 @@ build_dsdt(GArray *table_data, GArray *linker,
|
||||||
|
|
||||||
sb_scope = aml_scope("\\_SB");
|
sb_scope = aml_scope("\\_SB");
|
||||||
{
|
{
|
||||||
build_processor_devices(sb_scope, machine, cpu, pm);
|
build_processor_devices(sb_scope, machine, pm);
|
||||||
|
|
||||||
build_memory_devices(sb_scope, nr_mem, pm->mem_hp_io_base,
|
build_memory_devices(sb_scope, nr_mem, pm->mem_hp_io_base,
|
||||||
pm->mem_hp_io_len);
|
pm->mem_hp_io_len);
|
||||||
|
@ -2683,7 +2660,6 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
||||||
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
PCMachineClass *pcmc = PC_MACHINE_GET_CLASS(pcms);
|
||||||
GArray *table_offsets;
|
GArray *table_offsets;
|
||||||
unsigned facs, dsdt, rsdt, fadt;
|
unsigned facs, dsdt, rsdt, fadt;
|
||||||
AcpiCpuInfo cpu;
|
|
||||||
AcpiPmInfo pm;
|
AcpiPmInfo pm;
|
||||||
AcpiMiscInfo misc;
|
AcpiMiscInfo misc;
|
||||||
AcpiMcfgInfo mcfg;
|
AcpiMcfgInfo mcfg;
|
||||||
|
@ -2693,7 +2669,6 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
||||||
GArray *tables_blob = tables->table_data;
|
GArray *tables_blob = tables->table_data;
|
||||||
AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL };
|
AcpiSlicOem slic_oem = { .id = NULL, .table_id = NULL };
|
||||||
|
|
||||||
acpi_get_cpu_info(&cpu);
|
|
||||||
acpi_get_pm_info(&pm);
|
acpi_get_pm_info(&pm);
|
||||||
acpi_get_misc_info(&misc);
|
acpi_get_misc_info(&misc);
|
||||||
acpi_get_pci_info(&pci);
|
acpi_get_pci_info(&pci);
|
||||||
|
@ -2717,7 +2692,7 @@ void acpi_build(AcpiBuildTables *tables, MachineState *machine)
|
||||||
|
|
||||||
/* DSDT is pointed to by FADT */
|
/* DSDT is pointed to by FADT */
|
||||||
dsdt = tables_blob->len;
|
dsdt = tables_blob->len;
|
||||||
build_dsdt(tables_blob, tables->linker, &cpu, &pm, &misc, &pci, machine);
|
build_dsdt(tables_blob, tables->linker, &pm, &misc, &pci, machine);
|
||||||
|
|
||||||
/* Count the size of the DSDT and SSDT, we will need it for legacy
|
/* Count the size of the DSDT and SSDT, we will need it for legacy
|
||||||
* sizing of ACPI tables.
|
* sizing of ACPI tables.
|
||||||
|
|
Loading…
Reference in New Issue