david.venhoff/QEMU-Nyx-fork
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

pc: acpi: cpuhp: move CPMA() method into SSDT

Browse Source 
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>
This commit is contained in:
Igor Mammedov 2015-12-28 18:02:24 +01:00 committed by Michael S. Tsirkin
parent fbd7a6b8e2
commit 1d608d13eb
4 changed files with 28 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
hw/acpi/cpu_hotplug_acpi_table.c
View File

@ -19,6 +19,29 @@ void build_cpu_hotplug_aml(Aml *ctx)
{ {
Aml *method; Aml *method;
Aml *sb_scope = aml_scope("_SB"); Aml *sb_scope = aml_scope("_SB");
uint8_t madt_tmpl[8] = {0x00, 0x08, 0x00, 0x00, 0x00, 0, 0, 0};
Aml *cpu_id = aml_arg(0);
Aml *cpu_on = aml_local(0);
Aml *madt = aml_local(1);
Aml *cpus_map = aml_name(CPU_ON_BITMAP);
/*
* _MAT method - creates an madt apic buffer
* cpu_id = Arg0 = Processor ID = Local APIC ID
* cpu_on = Local0 = CPON flag for this cpu
* madt = Local1 = Buffer (in madt apic form) to return
*/
method = aml_method(CPU_MAT_METHOD, 1, AML_NOTSERIALIZED);
aml_append(method,
aml_store(aml_derefof(aml_index(cpus_map, cpu_id)), cpu_on));
aml_append(method,
aml_store(aml_buffer(sizeof(madt_tmpl), madt_tmpl), madt));
/* Update the processor id, lapic id, and enable/disable status */
aml_append(method, aml_store(cpu_id, aml_index(madt, aml_int(2))));
aml_append(method, aml_store(cpu_id, aml_index(madt, aml_int(3))));
aml_append(method, aml_store(cpu_on, aml_index(madt, aml_int(4))));
aml_append(method, aml_return(madt));
aml_append(sb_scope, method);
method = aml_method(CPU_EJECT_METHOD, 2, AML_NOTSERIALIZED); method = aml_method(CPU_EJECT_METHOD, 2, AML_NOTSERIALIZED);
aml_append(method, aml_sleep(200)); aml_append(method, aml_sleep(200));

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

@ -1318,7 +1318,8 @@ build_ssdt(GArray *table_data, GArray *linker,
dev = aml_processor(i, 0, 0, "CP%.02X", i); dev = aml_processor(i, 0, 0, "CP%.02X", i);
method = aml_method("_MAT", 0, AML_NOTSERIALIZED); method = aml_method("_MAT", 0, AML_NOTSERIALIZED);
aml_append(method, aml_return(aml_call1("CPMA", aml_int(i)))); aml_append(method,
aml_return(aml_call1(CPU_MAT_METHOD, aml_int(i))));
aml_append(dev, method); aml_append(dev, method);
method = aml_method("_STA", 0, AML_NOTSERIALIZED); method = aml_method("_STA", 0, AML_NOTSERIALIZED);
@ -1362,7 +1363,7 @@ build_ssdt(GArray *table_data, GArray *linker,
uint8_t b = test_bit(i, cpu->found_cpus) ? 0x01 : 0x00; uint8_t b = test_bit(i, cpu->found_cpus) ? 0x01 : 0x00;
aml_append(pkg, aml_int(b)); aml_append(pkg, aml_int(b));
} }
aml_append(sb_scope, aml_name_decl("CPON", pkg)); aml_append(sb_scope, aml_name_decl(CPU_ON_BITMAP, pkg));
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);

13
hw/i386/acpi-dsdt-cpu-hotplug.dsl
View File

@ -24,19 +24,6 @@ Scope(\_SB) {
External(PRS, FieldUnitObj) External(PRS, FieldUnitObj)
/* Methods called by run-time generated SSDT Processor objects */ /* Methods called by run-time generated SSDT Processor objects */
Method(CPMA, 1, NotSerialized) {
// _MAT method - create an madt apic buffer
// Arg0 = Processor ID = Local APIC ID
// Local0 = CPON flag for this cpu
Store(DerefOf(Index(CPON, Arg0)), Local0)
// Local1 = Buffer (in madt apic form) to return
Store(Buffer(8) {0x00, 0x08, 0x00, 0x00, 0x00, 0, 0, 0}, Local1)
// Update the processor id, lapic id, and enable/disable status
Store(Arg0, Index(Local1, 2))
Store(Arg0, Index(Local1, 3))
Store(Local0, Index(Local1, 4))
Return (Local1)
}
Method(CPST, 1, NotSerialized) { Method(CPST, 1, NotSerialized) {
// _STA method - return ON status of cpu // _STA method - return ON status of cpu
// Arg0 = Processor ID = Local APIC ID // Arg0 = Processor ID = Local APIC ID

2
include/hw/acpi/cpu_hotplug.h
View File

@ -28,6 +28,8 @@ void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
AcpiCpuHotplug *gpe_cpu, uint16_t base); AcpiCpuHotplug *gpe_cpu, uint16_t base);
#define CPU_EJECT_METHOD "CPEJ" #define CPU_EJECT_METHOD "CPEJ"
#define CPU_MAT_METHOD "CPMA"
#define CPU_ON_BITMAP "CPON"
void build_cpu_hotplug_aml(Aml *ctx); void build_cpu_hotplug_aml(Aml *ctx);
#endif #endif