From mboxrd@z Thu Jan 1 00:00:00 1970 Received: from eggs.gnu.org ([2001:4830:134:3::10]:47945) by lists.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcXyD-0002Eh-EJ for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:35:06 -0400 Received: from Debian-exim by eggs.gnu.org with spam-scanned (Exim 4.71) (envelope-from ) id 1YcXy9-0006gC-EP for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:35:05 -0400 Received: from mail-wg0-f42.google.com ([74.125.82.42]:35412) by eggs.gnu.org with esmtp (Exim 4.71) (envelope-from ) id 1YcXy9-0006g2-8H for qemu-devel@nongnu.org; Mon, 30 Mar 2015 07:35:01 -0400 Received: by wgdm6 with SMTP id m6so171013071wgd.2 for ; Mon, 30 Mar 2015 04:34:59 -0700 (PDT) From: Reza Jelveh Date: Mon, 30 Mar 2015 13:34:50 +0200 Message-Id: <1427715290-5435-1-git-send-email-fishman@saucelabs.com> Subject: [Qemu-devel] [RFC PATCH v2] acpi: add reset register to fadt List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , To: qemu-devel@nongnu.org Cc: marcel.apfelbaum@gmail.com, Reza Jelveh Some operating systems such as FreeBSD and Mac OSX need the reset_register section of the FADT filled to know which port to write to for a system reset. Signed-off-by: Reza Jelveh --- hw/i386/acpi-build.c | 9 +++++++++ hw/i386/acpi-defs.h | 2 ++ 2 files changed, 11 insertions(+) diff --git a/hw/i386/acpi-build.c b/hw/i386/acpi-build.c index d0a5c85..d029896 100644 --- a/hw/i386/acpi-build.c +++ b/hw/i386/acpi-build.c @@ -338,6 +338,8 @@ build_facs(GArray *table_data, GArray *linker, PcGuestInfo *guest_info) /* Load chipset information in FADT */ static void fadt_setup(AcpiFadtDescriptorRev1 *fadt, AcpiPmInfo *pm) { + Object *lpc = ich9_lpc_find(); + fadt->model = 1; fadt->reserved1 = 0; fadt->sci_int = cpu_to_le16(pm->sci_int); @@ -361,6 +363,13 @@ static void fadt_setup(AcpiFadtDescriptorRev1 *fadt, AcpiPmInfo *pm) (1 << ACPI_FADT_F_SLP_BUTTON) | (1 << ACPI_FADT_F_RTC_S4)); fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_USE_PLATFORM_CLOCK); + if (lpc) { + fadt->flags |= cpu_to_le32(1 << ACPI_FADT_F_RESET_REG_SUP); + fadt->reset_val = 0xA; + fadt->reset_reg.address_space_id = aml_system_io; + fadt->reset_reg.register_bit_width = 8; + fadt->reset_reg.address = ICH9_RST_CNT_IOPORT; + } /* APIC destination mode ("Flat Logical") has an upper limit of 8 CPUs * For more than 8 CPUs, "Clustered Logical" mode has to be used */ diff --git a/hw/i386/acpi-defs.h b/hw/i386/acpi-defs.h index c4468f8..960c833 100644 --- a/hw/i386/acpi-defs.h +++ b/hw/i386/acpi-defs.h @@ -132,6 +132,8 @@ struct AcpiFadtDescriptorRev1 uint8_t reserved4a; /* Reserved */ uint8_t reserved4b; /* Reserved */ uint32_t flags; + Acpi20GenericAddress reset_reg; + uint8_t reset_val; } QEMU_PACKED; typedef struct AcpiFadtDescriptorRev1 AcpiFadtDescriptorRev1; -- 2.3.4