openkylin
/
qemu
mirror of https://gitee.com/openkylin/qemu.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

pc: acpi: q35: move IQST() 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:
Igor Mammedov 2015-12-28 18:02:48 +01:00 committed by Michael S. Tsirkin
parent 16682a9d86
commit 78e1ad0509
2 changed files with 15 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1555,12 +1555,24 @@ static Aml *build_iqcr_method(bool is_piix4)
return method; return method;
} }
/* _STA method - get status */
static Aml *build_irq_status_method(void)
{
Aml *if_ctx;
Aml *method = aml_method("IQST", 1, AML_NOTSERIALIZED);
if_ctx = aml_if(aml_and(aml_int(0x80), aml_arg(0), NULL));
aml_append(if_ctx, aml_return(aml_int(0x09)));
aml_append(method, if_ctx);
aml_append(method, aml_return(aml_int(0x0B)));
return method;
}
static void build_piix4_pci0_int(Aml *table) static void build_piix4_pci0_int(Aml *table)
{ {
Aml *dev; Aml *dev;
Aml *crs; Aml *crs;
Aml *field; Aml *field;
Aml *if_ctx;
Aml *method; Aml *method;
uint32_t irqs; uint32_t irqs;
Aml *sb_scope = aml_scope("_SB"); Aml *sb_scope = aml_scope("_SB");
@ -1576,16 +1588,7 @@ static void build_piix4_pci0_int(Aml *table)
aml_append(field, aml_named_field("PRQ3", 8)); aml_append(field, aml_named_field("PRQ3", 8));
aml_append(sb_scope, field); aml_append(sb_scope, field);
/* _STA method - get status */ aml_append(sb_scope, build_irq_status_method());
method = aml_method("IQST", 1, AML_NOTSERIALIZED);
{
if_ctx = aml_if(aml_and(aml_int(0x80), aml_arg(0), NULL));
aml_append(if_ctx, aml_return(aml_int(0x09)));
aml_append(method, if_ctx);
aml_append(method, aml_return(aml_int(0x0B)));
}
aml_append(sb_scope, method);
aml_append(sb_scope, build_iqcr_method(true)); aml_append(sb_scope, build_iqcr_method(true));
aml_append(sb_scope, build_link_dev("LNKA", 0, aml_name("PRQ0"))); aml_append(sb_scope, build_link_dev("LNKA", 0, aml_name("PRQ0")));
@ -1632,6 +1635,7 @@ static void build_q35_pci0_int(Aml *table)
{ {
Aml *sb_scope = aml_scope("_SB"); Aml *sb_scope = aml_scope("_SB");
aml_append(sb_scope, build_irq_status_method());
aml_append(sb_scope, build_iqcr_method(false)); aml_append(sb_scope, build_iqcr_method(false));
aml_append(sb_scope, build_link_dev("LNKA", 0, aml_name("PRQA"))); aml_append(sb_scope, build_link_dev("LNKA", 0, aml_name("PRQA")));

8
hw/i386/q35-acpi-dsdt.dsl
View File

@ -298,14 +298,6 @@ DefinitionBlock (
PRQH, 8 PRQH, 8
} }
Method(IQST, 1, NotSerialized) {
// _STA method - get status
If (And(0x80, Arg0)) {
Return (0x09)
}
Return (0x0B)
}
External(LNKA, DeviceObj) External(LNKA, DeviceObj)
External(LNKB, DeviceObj) External(LNKB, DeviceObj)
External(LNKC, DeviceObj) External(LNKC, DeviceObj)