From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:43431) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6oNu-0000ea-MM for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:43:01 -0500 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1a6oNt-0004yy-84 for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:58 -0500 Received: from mx1.redhat.com ([209.132.183.28]:60926) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1a6oNt-0004ym-1f for qemu-devel@nongnu.org; Wed, 09 Dec 2015 18:42:57 -0500 Received: from int-mx09.intmail.prod.int.phx2.redhat.com (int-mx09.intmail.prod.int.phx2.redhat.com [10.5.11.22]) by mx1.redhat.com (Postfix) with ESMTPS id A69C137EE2 for ; Wed, 9 Dec 2015 23:42:56 +0000 (UTC) Received: from dell-r430-03.lab.eng.brq.redhat.com (dell-r430-03.lab.eng.brq.redhat.com [10.34.112.60]) by int-mx09.intmail.prod.int.phx2.redhat.com (8.14.4/8.14.4) with ESMTP id tB9Ng8Vq005315 for ; Wed, 9 Dec 2015 18:42:56 -0500 From: Igor Mammedov Date: Thu, 10 Dec 2015 00:41:44 +0100 Message-Id: <1449704528-289297-51-git-send-email-imammedo@redhat.com> In-Reply-To: <1449704528-289297-1-git-send-email-imammedo@redhat.com> References: <1449704528-289297-1-git-send-email-imammedo@redhat.com> Subject: [Qemu-devel] [PATCH 50/74] pc: acpi: move FDC0 device from DSDT to SSDT List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Signed-off-by: Igor Mammedov --- hw/i386/acpi-build.c | 38 ++++++++++++++++++++++++++++++++------ hw/i386/acpi-dsdt-isa.dsl | 18 ------------------ 2 files changed, 32 insertions(+), 24 deletions(-) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index e5ec6af..2f0f2e1 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -1173,17 +1173,34 @@ static void build_hpet_aml(Aml *table) static Aml * build_eisa_device_aml(const char *name, const char *hid, Aml *crs, - bool have_sta) + bool have_sta, const char *present_field) { Aml *dev; Aml *method; - Aml *a_device_present = aml_int(0x0f); dev = aml_device("%s", name); aml_append(dev, aml_name_decl("_HID", aml_eisaid(hid))); if (have_sta) { + Aml *if_ctx; + Aml *else_ctx; + Aml *a_zero = aml_int(0); + Aml *a_is_present = aml_local(0); + Aml *a_device_present = aml_int(0x0f); + Aml *a_device_not_present = aml_int(0x00); + method = aml_method("_STA", 0, AML_NOTSERIALIZED); - aml_append(method, aml_return(a_device_present)); + if (!present_field) { + aml_append(method, aml_return(a_device_present)); + } else { + aml_append(method, + aml_store(aml_name("%s", present_field), a_is_present)); + if_ctx = aml_if(aml_equal(a_is_present, a_zero)); + aml_append(if_ctx, aml_return(a_device_not_present)); + aml_append(method, if_ctx); + else_ctx = aml_else(); + aml_append(else_ctx, aml_return(a_device_present)); + aml_append(method, else_ctx); + } aml_append(dev, method); } aml_append(dev, aml_name_decl("_CRS", crs)); @@ -1201,19 +1218,28 @@ static void build_isa_devices_aml(Aml *table) aml_append(crs, aml_irq_no_flags(8)); aml_append(crs, aml_io(AML_DECODE16, 0x0072, 0x0072, 0x02, 0x06)); aml_append(scope, build_eisa_device_aml( - "RTC", "PNP0B00", crs, false)); + "RTC", "PNP0B00", crs, false, NULL)); crs = aml_resource_template(); aml_append(crs, aml_io(AML_DECODE16, 0x0060, 0x0060, 0x01, 0x01)); aml_append(crs, aml_io(AML_DECODE16, 0x0064, 0x0064, 0x01, 0x01)); aml_append(crs, aml_irq_no_flags(1)); aml_append(scope, build_eisa_device_aml( - "KBD", "PNP0303", crs, true)); + "KBD", "PNP0303", crs, true, NULL)); crs = aml_resource_template(); aml_append(crs, aml_irq_no_flags(12)); aml_append(scope, build_eisa_device_aml( - "MOU", "PNP0F13", crs, true)); + "MOU", "PNP0F13", crs, true, NULL)); + + 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(scope, build_eisa_device_aml( + "FDC0", "PNP0700", crs, true, "FDEN")); 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