[PATCH 1/4] ACPI: workaround x86 firmware using reserved MADT subtable IDs

From: Al Stone
Date: Tue Oct 13 2015 - 17:29:15 EST


According to the ACPI specification, version 6.0, table 5-46, MADT
subtable IDs in the range of 0x10-0x7f are reserved for possible
future use by the specification. The function bad_madt_entry() tries
to enforce the spec, but it turns out there are x86 machines that use
0x7f even though they should not.

So, continue to enforce this rule for arm64, since we're starting out
fresh, but relax it for systems already out there so we don't keep them
from booting.

Signed-off-by: Al Stone <al.stone@xxxxxxxxxx>
---
drivers/acpi/tables.c | 14 +++++++++++---
1 file changed, 11 insertions(+), 3 deletions(-)

diff --git a/drivers/acpi/tables.c b/drivers/acpi/tables.c
index a2ed38a..e5cfd72 100644
--- a/drivers/acpi/tables.c
+++ b/drivers/acpi/tables.c
@@ -413,9 +413,17 @@ static int __init bad_madt_entry(struct acpi_table_header *table,
}

if (entry->type >= ms->num_types) {
- pr_err("undefined MADT subtable type for FADT %d.%d: %d (length %d)\n",
- major, minor, entry->type, entry->length);
- return 1;
+ if (IS_ENABLED(CONFIG_ARM64)) {
+ /* Enforce this stricture on arm64... */
+ pr_err("undefined MADT subtable type for FADT %d.%d: %d (length %d)\n",
+ major, minor, entry->type, entry->length);
+ return 1;
+ } else {
+ /* ... but relax it on legacy systems so they boot */
+ pr_warn("undefined MADT subtable type for FADT %d.%d: %d (length %d)\n",
+ major, minor, entry->type, entry->length);
+ return 0;
+ }
}

/* verify that the table is allowed for this version of the spec */
--
2.4.3


--------------020400080004050109020606
Content-Type: text/x-patch;
name="0002-ACPI-workaround-x86-firmware-with-mis-matched-FADT-M.patch"
Content-Transfer-Encoding: 7bit
Content-Disposition: attachment;
filename*0="0002-ACPI-workaround-x86-firmware-with-mis-matched-FADT-M.pa";
filename*1="tch"