pc: acpi: cpuhp: move CPST() method into SSDT
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:
parent
1d608d13eb
commit
40f981a02d
|
@ -18,6 +18,8 @@
|
||||||
void build_cpu_hotplug_aml(Aml *ctx)
|
void build_cpu_hotplug_aml(Aml *ctx)
|
||||||
{
|
{
|
||||||
Aml *method;
|
Aml *method;
|
||||||
|
Aml *if_ctx;
|
||||||
|
Aml *else_ctx;
|
||||||
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};
|
uint8_t madt_tmpl[8] = {0x00, 0x08, 0x00, 0x00, 0x00, 0, 0, 0};
|
||||||
Aml *cpu_id = aml_arg(0);
|
Aml *cpu_id = aml_arg(0);
|
||||||
|
@ -43,6 +45,26 @@ void build_cpu_hotplug_aml(Aml *ctx)
|
||||||
aml_append(method, aml_return(madt));
|
aml_append(method, aml_return(madt));
|
||||||
aml_append(sb_scope, method);
|
aml_append(sb_scope, method);
|
||||||
|
|
||||||
|
/*
|
||||||
|
* _STA method - return ON status of cpu
|
||||||
|
* cpu_id = Arg0 = Processor ID = Local APIC ID
|
||||||
|
* cpu_on = Local0 = CPON flag for this cpu
|
||||||
|
*/
|
||||||
|
method = aml_method(CPU_STATUS_METHOD, 1, AML_NOTSERIALIZED);
|
||||||
|
aml_append(method,
|
||||||
|
aml_store(aml_derefof(aml_index(cpus_map, cpu_id)), cpu_on));
|
||||||
|
if_ctx = aml_if(cpu_on);
|
||||||
|
{
|
||||||
|
aml_append(if_ctx, aml_return(aml_int(0xF)));
|
||||||
|
}
|
||||||
|
aml_append(method, if_ctx);
|
||||||
|
else_ctx = aml_else();
|
||||||
|
{
|
||||||
|
aml_append(else_ctx, aml_return(aml_int(0x0)));
|
||||||
|
}
|
||||||
|
aml_append(method, else_ctx);
|
||||||
|
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));
|
||||||
aml_append(sb_scope, method);
|
aml_append(sb_scope, method);
|
||||||
|
|
|
@ -1323,7 +1323,8 @@ build_ssdt(GArray *table_data, GArray *linker,
|
||||||
aml_append(dev, method);
|
aml_append(dev, method);
|
||||||
|
|
||||||
method = aml_method("_STA", 0, AML_NOTSERIALIZED);
|
method = aml_method("_STA", 0, AML_NOTSERIALIZED);
|
||||||
aml_append(method, aml_return(aml_call1("CPST", aml_int(i))));
|
aml_append(method,
|
||||||
|
aml_return(aml_call1(CPU_STATUS_METHOD, aml_int(i))));
|
||||||
aml_append(dev, method);
|
aml_append(dev, method);
|
||||||
|
|
||||||
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
|
method = aml_method("_EJ0", 1, AML_NOTSERIALIZED);
|
||||||
|
|
|
@ -24,18 +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(CPST, 1, NotSerialized) {
|
|
||||||
// _STA method - return ON status of cpu
|
|
||||||
// Arg0 = Processor ID = Local APIC ID
|
|
||||||
// Local0 = CPON flag for this cpu
|
|
||||||
Store(DerefOf(Index(CPON, Arg0)), Local0)
|
|
||||||
If (Local0) {
|
|
||||||
Return (0xF)
|
|
||||||
} Else {
|
|
||||||
Return (0x0)
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
Method(PRSC, 0) {
|
Method(PRSC, 0) {
|
||||||
// Local5 = active cpu bitmap
|
// Local5 = active cpu bitmap
|
||||||
Store(PRS, Local5)
|
Store(PRS, Local5)
|
||||||
|
|
|
@ -30,6 +30,7 @@ void acpi_cpu_hotplug_init(MemoryRegion *parent, Object *owner,
|
||||||
#define CPU_EJECT_METHOD "CPEJ"
|
#define CPU_EJECT_METHOD "CPEJ"
|
||||||
#define CPU_MAT_METHOD "CPMA"
|
#define CPU_MAT_METHOD "CPMA"
|
||||||
#define CPU_ON_BITMAP "CPON"
|
#define CPU_ON_BITMAP "CPON"
|
||||||
|
#define CPU_STATUS_METHOD "CPST"
|
||||||
|
|
||||||
void build_cpu_hotplug_aml(Aml *ctx);
|
void build_cpu_hotplug_aml(Aml *ctx);
|
||||||
#endif
|
#endif
|
||||||
|
|
Loading…
Reference in a new issue