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


Groups > linux.kernel > #1235640

[PATCH v5 2/5] ACPI / ARM64: remove usage of BAD_MADT_ENTRY/BAD_MADT_GICC_ENTRY

From Al Stone <al.stone@linaro.org>
Newsgroups linux.kernel
Subject [PATCH v5 2/5] ACPI / ARM64: remove usage of BAD_MADT_ENTRY/BAD_MADT_GICC_ENTRY
Date 2015-09-30 01:50 +0200
Message-ID <qecOK-4AV-11@gated-at.bofh.it> (permalink)
References <qecOK-4AV-1@gated-at.bofh.it>
Organization linux.* mail to news gateway

Show all headers | View raw


Now that we have introduced the bad_madt_entry() function, and that
function is being invoked in acpi_table_parse_madt() for us, there
is no longer any need to use the BAD_MADT_ENTRY macro, or in the case
of arm64, the BAD_MADT_GICC_ENTRY, too.

Signed-off-by: Al Stone <al.stone@linaro.org>
Acked-by: Catalin Marinas <catalin.marinas@arm.com>
Acked-by: Marc Zyngier <marc.zyngier@arm.com>
Reviewed-and-tested-by: Sudeep Holla <sudeep.holla@arm.com>
Cc: Will Deacon <will.deacon@arm.com>
Cc: Thomas Gleixner <tglx@linutronix.de>
Cc: Jason Cooper <jason@lakedaemon.net>
---
 arch/arm64/include/asm/acpi.h | 8 --------
 arch/arm64/kernel/smp.c       | 2 --
 drivers/irqchip/irq-gic.c     | 3 ---
 3 files changed, 13 deletions(-)

diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h
index 6894205..05656fc 100644
--- a/arch/arm64/include/asm/acpi.h
+++ b/arch/arm64/include/asm/acpi.h
@@ -18,14 +18,6 @@
 #include <asm/cputype.h>
 #include <asm/smp_plat.h>
 
-/* Macros for consistency checks of the GICC subtable of MADT */
-#define ACPI_MADT_GICC_LENGTH	\
-	(acpi_gbl_FADT.header.revision < 6 ? 76 : 80)
-
-#define BAD_MADT_GICC_ENTRY(entry, end)						\
-	(!(entry) || (unsigned long)(entry) + sizeof(*(entry)) > (end) ||	\
-	 (entry)->header.length != ACPI_MADT_GICC_LENGTH)
-
 /* Basic configuration for ACPI */
 #ifdef	CONFIG_ACPI
 /* ACPI table mapping after acpi_gbl_permanent_mmap is set */
diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c
index dbdaacd..66cc8c4 100644
--- a/arch/arm64/kernel/smp.c
+++ b/arch/arm64/kernel/smp.c
@@ -451,8 +451,6 @@ 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_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 d4add30..67b7b48 100644
--- a/drivers/irqchip/irq-gic.c
+++ b/drivers/irqchip/irq-gic.c
@@ -1206,9 +1206,6 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header,
 
 	processor = (struct acpi_madt_generic_interrupt *)header;
 
-	if (BAD_MADT_GICC_ENTRY(processor, end))
-		return -EINVAL;
-
 	/*
 	 * There is no support for non-banked GICv1/2 register in ACPI spec.
 	 * All CPU interface addresses have to be the same.
-- 
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 v5 0/5] Provide better MADT subtable sanity checks Al Stone <al.stone@linaro.org> - 2015-09-30 01:50 +0200
  [PATCH v5 1/5] ACPI: add in a bad_madt_entry() function to eventually replace the macro Al Stone <al.stone@linaro.org> - 2015-09-30 01:50 +0200
  [PATCH v5 4/5] ACPI / X86: remove usage of BAD_MADT_ENTRY Al Stone <al.stone@linaro.org> - 2015-09-30 01:50 +0200
  [PATCH v5 2/5] ACPI / ARM64: remove usage of BAD_MADT_ENTRY/BAD_MADT_GICC_ENTRY Al Stone <al.stone@linaro.org> - 2015-09-30 01:50 +0200
  [PATCH v5 3/5] ACPI / IA64: remove usage of BAD_MADT_ENTRY Al Stone <al.stone@linaro.org> - 2015-09-30 01:50 +0200
  [PATCH v5 5/5] ACPI: remove definition of BAD_MADT_ENTRY macro Al Stone <al.stone@linaro.org> - 2015-09-30 01:50 +0200
  Re: [PATCH v5 0/5] Provide better MADT subtable sanity checks Hanjun Guo <guohanjun@huawei.com> - 2015-09-30 11:10 +0200
    Re: [PATCH v5 0/5] Provide better MADT subtable sanity checks Al Stone <ahs3@redhat.com> - 2015-09-30 18:20 +0200
      Re: [PATCH v5 0/5] Provide better MADT subtable sanity checks "Rafael J. Wysocki" <rjw@rjwysocki.net> - 2015-10-05 15:20 +0200
        Re: [PATCH v5 0/5] Provide better MADT subtable sanity checks Al Stone <ahs3@redhat.com> - 2015-10-05 19:20 +0200

csiph-web