Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]


Groups > linux.kernel > #1176267

[PATCH v3 3/3] ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro

From Al Stone <al.stone@linaro.org>
Newsgroups linux.kernel
Subject [PATCH v3 3/3] ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro
Date 2015-07-03 01:50 +0200
Message-ID <pHWoV-X2-3@gated-at.bofh.it> (permalink)
References <pHWoV-X2-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


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: aeb823bbacc2 (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>
---
 arch/arm64/kernel/smp.c   | 2 +-
 drivers/irqchip/irq-gic.c | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index a1883bf..25fc88c 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -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);
diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c
index 8d7e1c8..4dd8826 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -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;
 
 	/*
-- 
2.4.3

--
To unsubscribe from this list: send the line "unsubscribe linux-kernel" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
Please read the FAQ at  http://www.tux.org/lkml/

Back to linux.kernel | Previous | NextPrevious in thread | Next in thread | Find similar | Unroll thread


Thread

[PATCH v3 0/3] Correct for ACPI 5.1->6.0 spec changes in MADT GICC entries Al Stone <al.stone@linaro.org> - 2015-07-03 01:50 +0200
  [PATCH v3 3/3] ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro Al Stone <al.stone@linaro.org> - 2015-07-03 01:50 +0200
  [PATCH v3 2/3] ACPI / ARM64: add BAD_MADT_GICC_ENTRY() macro Al Stone <al.stone@linaro.org> - 2015-07-03 01:50 +0200
    Re: [PATCH v3 2/3] ACPI / ARM64: add BAD_MADT_GICC_ENTRY() macro Catalin Marinas <catalin.marinas@arm.com> - 2015-07-03 16:10 +0200
      Re: [PATCH v3 2/3] ACPI / ARM64: add BAD_MADT_GICC_ENTRY() macro Al Stone <ahs3@redhat.com> - 2015-07-06 23:30 +0200
  [PATCH v3 1/3] ACPI : introduce macros for using the ACPI specification version Al Stone <al.stone@linaro.org> - 2015-07-03 01:50 +0200
    Re: [PATCH v3 1/3] ACPI : introduce macros for using the ACPI specification version "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-07-03 02:00 +0200
  Re: [PATCH v3 1/3] ACPI : introduce macros for using the ACPI specification  version Al Stone <ahs3@redhat.com> - 2015-07-07 00:00 +0200
    Re: [PATCH v3 1/3] ACPI : introduce macros for using the ACPI specification version "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-07-07 00:20 +0200

csiph-web