[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Qemu-devel] [PATCH v2 27/51] pc: acpi: move FDC0 device from DSDT to SS
From: |
Igor Mammedov |
Subject: |
[Qemu-devel] [PATCH v2 27/51] pc: acpi: move FDC0 device from DSDT to SSDT |
Date: |
Mon, 28 Dec 2015 18:02:34 +0100 |
Signed-off-by: Igor Mammedov <address@hidden>
---
hw/i386/acpi-build.c | 40 ++++++++++++++++++++++++++++++++++++++++
hw/i386/acpi-dsdt-isa.dsl | 18 ------------------
2 files changed, 40 insertions(+), 18 deletions(-)
diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c
index 207dfb9..9ca428a 100644
--- a/hw/i386/acpi-build.c
+++ b/hw/i386/acpi-build.c
@@ -1197,6 +1197,44 @@ static void build_hpet_aml(Aml *table)
aml_append(table, scope);
}
+static Aml *build_fdc_device_aml(void)
+{
+ Aml *dev;
+ Aml *crs;
+ Aml *method;
+ Aml *if_ctx;
+ Aml *else_ctx;
+ Aml *zero = aml_int(0);
+ Aml *is_present = aml_local(0);
+
+ dev = aml_device("FDC0");
+ aml_append(dev, aml_name_decl("_HID", aml_eisaid("PNP0700")));
+
+ method = aml_method("_STA", 0, AML_NOTSERIALIZED);
+ aml_append(method, aml_store(aml_name("FDEN"), is_present));
+ if_ctx = aml_if(aml_equal(is_present, zero));
+ {
+ aml_append(if_ctx, aml_return(aml_int(0x00)));
+ }
+ aml_append(method, if_ctx);
+ else_ctx = aml_else();
+ {
+ aml_append(else_ctx, aml_return(aml_int(0x0f)));
+ }
+ aml_append(method, else_ctx);
+ aml_append(dev, method);
+
+ crs = aml_resource_template();
+ aml_append(crs, aml_io(AML_DECODE16, 0x03F2, 0x03F2, 0x00, 0x04));
+ aml_append(crs, aml_io(AML_DECODE16, 0x03F7, 0x03F7, 0x00, 0x01));
+ aml_append(crs, aml_irq_no_flags(6));
+ aml_append(crs,
+ aml_dma(AML_COMPATIBILITY, AML_NOTBUSMASTER, AML_TRANSFER8, 2));
+ aml_append(dev, aml_name_decl("_CRS", crs));
+
+ return dev;
+}
+
static Aml *build_rtc_device_aml(void)
{
Aml *dev;
@@ -1208,6 +1246,7 @@ static Aml *build_rtc_device_aml(void)
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;
}
@@ -1261,6 +1300,7 @@ static void build_isa_devices_aml(Aml *table)
aml_append(scope, build_rtc_device_aml());
aml_append(scope, build_kbd_device_aml());
aml_append(scope, build_mouse_device_aml());
+ aml_append(scope, build_fdc_device_aml());
aml_append(table, scope);
}
diff --git a/hw/i386/acpi-dsdt-isa.dsl b/hw/i386/acpi-dsdt-isa.dsl
index 8936271..64dd4ac 100644
--- a/hw/i386/acpi-dsdt-isa.dsl
+++ b/hw/i386/acpi-dsdt-isa.dsl
@@ -16,24 +16,6 @@
/* Common legacy ISA style devices. */
Scope(\_SB.PCI0.ISA) {
- Device(FDC0) {
- Name(_HID, EisaId("PNP0700"))
- Method(_STA, 0, NotSerialized) {
- Store(FDEN, Local0)
- If (LEqual(Local0, 0)) {
- Return (0x00)
- } Else {
- Return (0x0F)
- }
- }
- Name(_CRS, ResourceTemplate() {
- IO(Decode16, 0x03F2, 0x03F2, 0x00, 0x04)
- IO(Decode16, 0x03F7, 0x03F7, 0x00, 0x01)
- IRQNoFlags() { 6 }
- DMA(Compatibility, NotBusMaster, Transfer8) { 2 }
- })
- }
-
Device(LPT) {
Name(_HID, EisaId("PNP0400"))
Method(_STA, 0, NotSerialized) {
--
1.8.3.1
- [Qemu-devel] [PATCH v2 09/51] pc: acpi: memhp: move MHPD.MEJ0 method into SSDT, (continued)
- [Qemu-devel] [PATCH v2 09/51] pc: acpi: memhp: move MHPD.MEJ0 method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 13/51] pc: acpi: memhp: move \_GPE._E03 into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 16/51] pc: acpi: cpuhp: move CPEJ() method to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 12/51] pc: acpi: factor out memhp code from build_ssdt() into separate function, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 21/51] pc: acpi: factor out cpu hotplug code from build_ssdt() into separate function, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 23/51] pc: acpi: move DBUG() from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 22/51] pc: acpi: move HPET from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 25/51] pc: acpi: move KBD device from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 20/51] pc: acpi: cpuhp: move \_GPE._E02() into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 19/51] pc: acpi: cpuhp: move PRSC() method into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 27/51] pc: acpi: move FDC0 device from DSDT to SSDT,
Igor Mammedov <=
- [Qemu-devel] [PATCH v2 24/51] pc: acpi: move RTC device from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 26/51] pc: acpi: move MOU device from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 28/51] pc: acpi: move LPT device from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 36/51] pc: acpi: piix4: move remaining PCI hotplug bits into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 29/51] pc: acpi: move COM devices from DSDT to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 37/51] pc: acpi: piix4: acpi move PCI0 device to SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 34/51] pc: acpi: piix4: move IQST() into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 30/51] pc: acpi: move PIIX4 isa-bridge and pm devices into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 31/51] pc: acpi: move remaining GPE handlers into SSDT, Igor Mammedov, 2015/12/28
- [Qemu-devel] [PATCH v2 32/51] pc: acpi: pci: move link devices into SSDT, Igor Mammedov, 2015/12/28