linux-kernel.vger.kernel.org archive mirror
 help / color / mirror / Atom feed
From: Al Stone <al.stone@linaro.org>
To: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org
Cc: linux-kernel@vger.kernel.org, linux-ia64@vger.kernel.org,
	linux-pm@vger.kernel.org, linaro-acpi@lists.linaro.org,
	linaro-kernel@lists.linaro.org, patches@linaro.org,
	Al Stone <al.stone@linaro.org>, Will Deacon <will.deacon@arm.com>,
	Thomas Gleixner <tglx@linutronix.de>,
	Jason Cooper <jason@lakedaemon.net>
Subject: [PATCH v5 2/5] ACPI / ARM64: remove usage of BAD_MADT_ENTRY/BAD_MADT_GICC_ENTRY
Date: Tue, 29 Sep 2015 17:45:43 -0600	[thread overview]
Message-ID: <1443570346-15378-3-git-send-email-al.stone@linaro.org> (raw)
In-Reply-To: <1443570346-15378-1-git-send-email-al.stone@linaro.org>

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


  parent reply	other threads:[~2015-09-29 23:47 UTC|newest]

Thread overview: 26+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2015-09-29 23:45 [PATCH v5 0/5] Provide better MADT subtable sanity checks Al Stone
2015-09-29 23:45 ` [PATCH v5 1/5] ACPI: add in a bad_madt_entry() function to eventually replace the macro Al Stone
2015-09-29 23:45 ` Al Stone [this message]
2015-09-29 23:45 ` [PATCH v5 3/5] ACPI / IA64: remove usage of BAD_MADT_ENTRY Al Stone
2015-09-29 23:45 ` [PATCH v5 4/5] ACPI / X86: " Al Stone
2015-09-29 23:45 ` [PATCH v5 5/5] ACPI: remove definition of BAD_MADT_ENTRY macro Al Stone
2015-09-30  9:00 ` [PATCH v5 0/5] Provide better MADT subtable sanity checks Hanjun Guo
2015-09-30 16:10   ` Al Stone
2015-10-05 13:39     ` Rafael J. Wysocki
2015-10-05 17:12       ` Al Stone
2015-10-12  3:08         ` Pat Erley
2015-10-12  3:49           ` [Linaro-acpi] " Hanjun Guo
2015-10-12  3:58             ` Pat Erley
2015-10-12  7:04               ` Hanjun Guo
2015-10-12  9:44                 ` Sudeep Holla
2015-10-12 13:04                   ` Hanjun Guo
2015-10-12 19:25                   ` Rafael J. Wysocki
2015-10-12 19:07                     ` Al Stone
2015-10-13  8:43                     ` Sudeep Holla
2015-10-12 19:21                 ` Rafael J. Wysocki
2015-10-13  1:23                   ` Hanjun Guo
2015-10-12 20:52               ` Al Stone
2015-10-13  4:06                 ` Pat Erley
2015-10-14 20:20                   ` Al Stone
2015-10-14 21:25                     ` Rafael J. Wysocki
2015-10-14 21:27                       ` Al Stone

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=1443570346-15378-3-git-send-email-al.stone@linaro.org \
    --to=al.stone@linaro.org \
    --cc=jason@lakedaemon.net \
    --cc=linaro-acpi@lists.linaro.org \
    --cc=linaro-kernel@lists.linaro.org \
    --cc=linux-acpi@vger.kernel.org \
    --cc=linux-arm-kernel@lists.infradead.org \
    --cc=linux-ia64@vger.kernel.org \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-pm@vger.kernel.org \
    --cc=patches@linaro.org \
    --cc=tglx@linutronix.de \
    --cc=will.deacon@arm.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).