linux-acpi.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Matthew Garrett <mjg@redhat.com>
To: linux-acpi@vger.kernel.org
Cc: linux-kernel@vger.kernel.org, x86@kernel.org,
	Matthew Garrett <mjg@redhat.com>
Subject: [PATCH 4/4] ACPI: Make sure the FADT is at least rev 2 before using the reset register
Date: Fri, 11 Mar 2011 16:12:20 -0500	[thread overview]
Message-ID: <1299877940-6870-4-git-send-email-mjg@redhat.com> (raw)
In-Reply-To: <1299877940-6870-1-git-send-email-mjg@redhat.com>

The reset register was only introduced with version 2 of the FADT, so we
should check that the FADT revision before trusting its contents.

Signed-off-by: Matthew Garrett <mjg@redhat.com>
---
 drivers/acpi/reboot.c |    5 +++++
 1 files changed, 5 insertions(+), 0 deletions(-)

diff --git a/drivers/acpi/reboot.c b/drivers/acpi/reboot.c
index 4870aaa..a6c77e8b 100644
--- a/drivers/acpi/reboot.c
+++ b/drivers/acpi/reboot.c
@@ -15,6 +15,11 @@ void acpi_reboot(void)
 
 	rr = &acpi_gbl_FADT.reset_register;
 
+	/* ACPI reset register was only introduced with v2 of the FADT */
+
+	if (acpi_gbl_FADT.header.revision < 2)
+		return;
+
 	/* Is the reset register supported? The spec says we should be
 	 * checking the bit width and bit offset, but Windows ignores
 	 * these fields */
-- 
1.7.4.1

  parent reply	other threads:[~2011-03-11 21:12 UTC|newest]

Thread overview: 13+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2011-03-11 21:12 [PATCH 1/4] X86: Revamp reboot behaviour to match Windows more closely Matthew Garrett
2011-03-11 21:12 ` [PATCH 2/4] ACPICA: Fix access width for reset vector Matthew Garrett
2011-03-23  3:52   ` Len Brown
2011-03-11 21:12 ` [PATCH 3/4] ACPI: Bug compatibility for Windows on the ACPI reboot vector Matthew Garrett
2011-03-23  3:52   ` Len Brown
2011-03-11 21:12 ` Matthew Garrett [this message]
2011-03-23  4:01   ` [PATCH 4/4] ACPI: Make sure the FADT is at least rev 2 before using the reset register Len Brown
2011-03-23 10:59     ` Matthew Garrett
2011-03-11 22:08 ` [PATCH 1/4] X86: Revamp reboot behaviour to match Windows more closely Rafael J. Wysocki
2011-03-11 22:15   ` Matthew Garrett
2011-03-11 22:18     ` Rafael J. Wysocki
2011-03-23  3:49       ` Len Brown
2011-03-23  4:08 ` Len Brown

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=1299877940-6870-4-git-send-email-mjg@redhat.com \
    --to=mjg@redhat.com \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=x86@kernel.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).