From: Reza Jelveh <fishman@saucelabs.com>
To: qemu-devel@nongnu.org
Cc: marcel.apfelbaum@gmail.com, Reza Jelveh <fishman@saucelabs.com>
Subject: [Qemu-devel] [RFC PATCH v2] acpi: add reset register to fadt
Date: Mon, 30 Mar 2015 13:34:50 +0200 [thread overview]
Message-ID: <1427715290-5435-1-git-send-email-fishman@saucelabs.com> (raw)
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 <fishman@saucelabs.com>
---
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
next reply other threads:[~2015-03-30 11:35 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2015-03-30 11:34 Reza Jelveh [this message]
2015-03-31 11:34 ` [Qemu-devel] [RFC PATCH v2] acpi: add reset register to fadt Andreas Färber
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1427715290-5435-1-git-send-email-fishman@saucelabs.com \
--to=fishman@saucelabs.com \
--cc=marcel.apfelbaum@gmail.com \
--cc=qemu-devel@nongnu.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).