Commit 99e3e3ae authored Jul 06, 2015 by Al Stone Committed by Catalin Marinas Jul 07, 2015

ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro



For those parts of the arm64 ACPI code that need to check GICC subtables
in the MADT, use the new BAD_MADT_GICC_ENTRY macro instead of the previous
BAD_MADT_ENTRY.  The new macro takes into account differences in the size
of the GICC subtable that the old macro did not; this caused failures even
though the subtable entries are valid.

Fixes: aeb823bb ("ACPICA: ACPI 6.0: Add changes for FADT table.")
Signed-off-by: Al Stone <al.stone@linaro.org>
Reviewed-by: Hanjun Guo <hanjun.guo@linaro.org>
Acked-by: Will Deacon <will.deacon@arm.com>
Acked-by: "Rafael J. Wysocki" <rjw@rjwysocki.net>
Signed-off-by: Catalin Marinas <catalin.marinas@arm.com>

parent b6cfb277

arch/arm64/kernel/smp.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -438,7 +438,7 @@ acpi_parse_gic_cpu_interface(struct acpi_subtable_header *header,
		struct acpi_madt_generic_interrupt *processor;

		processor = (struct acpi_madt_generic_interrupt *)header;
		if (BAD_MADT_ENTRY(processor, end))
		if (BAD_MADT_GICC_ENTRY(processor, end))
		return -EINVAL;

		acpi_table_print_madt_entry(header);

drivers/irqchip/irq-gic.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -1055,7 +1055,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,

		processor = (struct acpi_madt_generic_interrupt *)header;

		if (BAD_MADT_ENTRY(processor, end))
		if (BAD_MADT_GICC_ENTRY(processor, end))
		return -EINVAL;

		/*

Admin message