>From 8615c4f2d61816447d16b8b5e2905a8fec397be4 Mon Sep 17 00:00:00 2001 From: Al Stone Date: Tue, 9 Jun 2015 15:16:36 -0600 Subject: [PATCH 2/2] ARM64 / ACPI : require compliance with at least ACPI 6.0 The MADT has a subtable called the GICC (GIC CPU) that changes size between 5.1 and 6.0. While we can use either size, the struct provided by the underlying ACPICA code is only for use with 6.0. Since it is highly unlikely any 5.1 ARM64 servers exist, we force ACPI on ARMv8 to use only firmware compatible with 6.0 or newer. Signed-off-by: Al Stone --- arch/arm64/kernel/acpi.c | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 38146ce..5ee0448 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -280,13 +280,12 @@ static int __init acpi_fadt_sanity_check(void) /* * Revision in table header is the FADT Major revision, and there - * is a minor revision of FADT which was introduced by ACPI 5.1, - * we only deal with ACPI 5.1 or newer revision to get GIC and SMP + * is a minor revision of FADT which was introduced by ACPI 5.1. + * We only deal with ACPI 6.0 or newer revision to get GIC and SMP * boot protocol configuration data. */ - if (table->revision < 5 || - (table->revision == 5 && fadt->minor_revision < 1)) { - pr_err("Unsupported FADT revision %d.%d, should be 5.1+\n", + if (table->revision < 6) { + pr_err("Unsupported FADT revision %d.%d, should be 6.0+\n", table->revision, fadt->minor_revision); ret = -EINVAL; goto out; -- 2.4.0