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

pc: acpi: move RTC device from DSDT to 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:31 +01:00 committed by Michael S. Tsirkin
parent 3892a2b741
commit ee13584996
2 changed files with 26 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1199,6 +1199,31 @@ static void build_hpet_aml(Aml *table)
aml_append(table, scope); aml_append(table, scope);
} }
static Aml *build_rtc_device_aml(void)
{
Aml *dev;
Aml *crs;
dev = aml_device("RTC");
aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0B00")));
crs = aml_resource_template();
aml_append(crs, aml_io(AML_DECODE16, 0x0070, 0x0070, 0x10, 0x02));
aml_append(crs, aml_irq_no_flags(8));
aml_append(crs, aml_io(AML_DECODE16, 0x0072, 0x0072, 0x02, 0x06));
aml_append(dev, aml_name_decl("_CRS", crs));
return dev;
}
static void build_isa_devices_aml(Aml *table)
{
Aml *scope = aml_scope("_SB.PCI0.ISA");
aml_append(scope, build_rtc_device_aml());
aml_append(table, scope);
}
static void build_dbg_aml(Aml *table) static void build_dbg_aml(Aml *table)
{ {
Aml *field; Aml *field;
@ -1256,6 +1281,7 @@ build_ssdt(GArray *table_data, GArray *linker,
build_dbg_aml(ssdt); build_dbg_aml(ssdt);
build_hpet_aml(ssdt); build_hpet_aml(ssdt);
build_isa_devices_aml(ssdt);
build_cpu_hotplug_aml(ssdt); build_cpu_hotplug_aml(ssdt);
build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base, build_memory_hotplug_aml(ssdt, nr_mem, pm->mem_hp_io_base,
pm->mem_hp_io_len); pm->mem_hp_io_len);

9
hw/i386/acpi-dsdt-isa.dsl
View File

@ -16,15 +16,6 @@
/* Common legacy ISA style devices. */ /* Common legacy ISA style devices. */
Scope(\_SB.PCI0.ISA) { Scope(\_SB.PCI0.ISA) {
Device(RTC) {
Name(_HID, EisaId("PNP0B00"))
Name(_CRS, ResourceTemplate() {
IO(Decode16, 0x0070, 0x0070, 0x10, 0x02)
IRQNoFlags() { 8 }
IO(Decode16, 0x0072, 0x0072, 0x02, 0x06)
})
}
Device(KBD) { Device(KBD) {
Name(_HID, EisaId("PNP0303")) Name(_HID, EisaId("PNP0303"))
Method(_STA, 0, NotSerialized) { Method(_STA, 0, NotSerialized) {