From: Alex Williamson <alex.williamson-VXdhtT5mjnY@public.gmane.org>
To: linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.org,
acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org
Cc: len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org
Subject: [PATCH] 2.4/2.6 use xdsdt to print table header
Date: Mon, 12 Jan 2004 17:32:16 -0700 [thread overview]
Message-ID: <1073953935.6497.173.camel@patsy.fc.hp.com> (raw)
I'm resending this patch to get it into the main ACPI source. This
fixes a problem where the DSDT pointer in the FADT is NULL because it
uses the 64bit XDSDT instead. The current code is happy to map a NULL
address and return success to the caller. This can crash the system or
printout garbage headers to the console. It's a simple matter to check
table revision and use the XDSDT in favor of the DSDT. This has been
living happily in both the 2.4 and 2.6 ia64 tree for some time. Please
accept. Thanks,
Alex
--
Alex Williamson HP Linux & Open Source Lab
diff -Nru a/drivers/acpi/tables.c b/drivers/acpi/tables.c
--- a/drivers/acpi/tables.c Mon Jan 12 15:37:12 2004
+++ b/drivers/acpi/tables.c Mon Jan 12 15:37:12 2004
@@ -262,10 +262,17 @@
/* Map the DSDT header via the pointer in the FADT */
if (id == ACPI_DSDT) {
- struct acpi_table_fadt *fadt = (struct acpi_table_fadt *) *header;
+ struct fadt_descriptor_rev2 *fadt = (struct fadt_descriptor_rev2 *) *header;
+
+ if (fadt->revision == 3 && fadt->Xdsdt) {
+ *header = (void *) __acpi_map_table(fadt->Xdsdt,
+ sizeof(struct acpi_table_header));
+ } else if (fadt->V1_dsdt) {
+ *header = (void *) __acpi_map_table(fadt->V1_dsdt,
+ sizeof(struct acpi_table_header));
+ } else
+ *header = 0;
- *header = (void *) __acpi_map_table(fadt->dsdt_addr,
- sizeof(struct acpi_table_header));
if (!*header) {
printk(KERN_WARNING PREFIX "Unable to map DSDT\n");
return -ENODEV;
-------------------------------------------------------
This SF.net email is sponsored by: Perforce Software.
Perforce is the Fast Software Configuration Management System offering
advanced branching capabilities and atomic changes on 50+ platforms.
Free Eval! http://www.perforce.com/perforce/loadprog.html
WARNING: multiple messages have this Message-ID (diff)
From: Alex Williamson <alex.williamson@hp.com>
To: linux-kernel@vger.kernel.org, acpi-devel@lists.sourceforge.net
Cc: len.brown@intel.com
Subject: [PATCH] 2.4/2.6 use xdsdt to print table header
Date: Mon, 12 Jan 2004 17:32:16 -0700 [thread overview]
Message-ID: <1073953935.6497.173.camel@patsy.fc.hp.com> (raw)
I'm resending this patch to get it into the main ACPI source. This
fixes a problem where the DSDT pointer in the FADT is NULL because it
uses the 64bit XDSDT instead. The current code is happy to map a NULL
address and return success to the caller. This can crash the system or
printout garbage headers to the console. It's a simple matter to check
table revision and use the XDSDT in favor of the DSDT. This has been
living happily in both the 2.4 and 2.6 ia64 tree for some time. Please
accept. Thanks,
Alex
--
Alex Williamson HP Linux & Open Source Lab
diff -Nru a/drivers/acpi/tables.c b/drivers/acpi/tables.c
--- a/drivers/acpi/tables.c Mon Jan 12 15:37:12 2004
+++ b/drivers/acpi/tables.c Mon Jan 12 15:37:12 2004
@@ -262,10 +262,17 @@
/* Map the DSDT header via the pointer in the FADT */
if (id == ACPI_DSDT) {
- struct acpi_table_fadt *fadt = (struct acpi_table_fadt *) *header;
+ struct fadt_descriptor_rev2 *fadt = (struct fadt_descriptor_rev2 *) *header;
+
+ if (fadt->revision == 3 && fadt->Xdsdt) {
+ *header = (void *) __acpi_map_table(fadt->Xdsdt,
+ sizeof(struct acpi_table_header));
+ } else if (fadt->V1_dsdt) {
+ *header = (void *) __acpi_map_table(fadt->V1_dsdt,
+ sizeof(struct acpi_table_header));
+ } else
+ *header = 0;
- *header = (void *) __acpi_map_table(fadt->dsdt_addr,
- sizeof(struct acpi_table_header));
if (!*header) {
printk(KERN_WARNING PREFIX "Unable to map DSDT\n");
return -ENODEV;
next reply other threads:[~2004-01-13 0:32 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2004-01-13 0:32 Alex Williamson [this message]
2004-01-13 0:32 ` [PATCH] 2.4/2.6 use xdsdt to print table header Alex Williamson
[not found] ` <1073953935.6497.173.camel-Wmjt7DDUnIVxnVILBQAtiA@public.gmane.org>
2004-01-26 21:58 ` Len Brown
2004-01-26 21:58 ` Len Brown
-- strict thread matches above, loose matches on Subject: below --
2004-01-13 7:38 Yu, Luming
[not found] ` <3ACA40606221794F80A5670F0AF15F8401720CC2-SRlDPOYGfgogGBtAFL8yw7fspsVTdybXVpNB7YpNyf8@public.gmane.org>
2004-01-13 15:28 ` Alex Williamson
2004-01-18 2:41 Yu, Luming
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=1073953935.6497.173.camel@patsy.fc.hp.com \
--to=alex.williamson-vxdhtt5mjny@public.gmane.org \
--cc=acpi-devel-5NWGOfrQmneRv+LV9MX5uipxlwaOVQ5f@public.gmane.org \
--cc=len.brown-ral2JQCrhuEAvxtiuMwx3w@public.gmane.org \
--cc=linux-kernel-u79uwXL29TY76Z2rM5mHXA@public.gmane.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.