| Message ID | 1438894770-31163-3-git-send-email-al.stone@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
Hi Al, On 06/08/15 21:59, Al Stone wrote: > 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> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Marc Zyngier <marc.zyngier@arm.com> > --- > arch/arm64/include/asm/acpi.h | 8 -------- > arch/arm64/kernel/smp.c | 2 -- > drivers/irqchip/irq-gic.c | 6 ------ > 3 files changed, 16 deletions(-) > > diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h > index 406485e..39248d3 100644 > --- a/arch/arm64/include/asm/acpi.h > +++ b/arch/arm64/include/asm/acpi.h > @@ -19,14 +19,6 @@ > #include <asm/psci.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 50fb469..acd3b27 100644 > --- a/arch/arm64/kernel/smp.c > +++ b/arch/arm64/kernel/smp.c > @@ -438,8 +438,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 4dd8826..2735611 100644 > --- a/drivers/irqchip/irq-gic.c > +++ b/drivers/irqchip/irq-gic.c > @@ -1055,9 +1055,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. > @@ -1079,9 +1076,6 @@ gic_acpi_parse_madt_distributor(struct acpi_subtable_header *header, > > dist = (struct acpi_madt_generic_distributor *)header; > > - if (BAD_MADT_ENTRY(dist, end)) > - return -EINVAL; > - > dist_phy_base = dist->base_address; > return 0; > } > Thanks a lot for doing this - the proliferation of this macro has been driving me insane. Acked-by: Marc Zyngier <marc.zyngier@arm.com> M.
On Thu, Aug 06, 2015 at 02:59:27PM -0600, Al Stone wrote: > 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> > Cc: Catalin Marinas <catalin.marinas@arm.com> > Cc: Will Deacon <will.deacon@arm.com> > Cc: Thomas Gleixner <tglx@linutronix.de> > Cc: Jason Cooper <jason@lakedaemon.net> > Cc: Marc Zyngier <marc.zyngier@arm.com> Acked-by: Catalin Marinas <catalin.marinas@arm.com>
diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 406485e..39248d3 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -19,14 +19,6 @@ #include <asm/psci.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 50fb469..acd3b27 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -438,8 +438,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 4dd8826..2735611 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1055,9 +1055,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. @@ -1079,9 +1076,6 @@ gic_acpi_parse_madt_distributor(struct acpi_subtable_header *header, dist = (struct acpi_madt_generic_distributor *)header; - if (BAD_MADT_ENTRY(dist, end)) - return -EINVAL; - dist_phy_base = dist->base_address; return 0; }
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> Cc: Catalin Marinas <catalin.marinas@arm.com> Cc: Will Deacon <will.deacon@arm.com> Cc: Thomas Gleixner <tglx@linutronix.de> Cc: Jason Cooper <jason@lakedaemon.net> Cc: Marc Zyngier <marc.zyngier@arm.com> --- arch/arm64/include/asm/acpi.h | 8 -------- arch/arm64/kernel/smp.c | 2 -- drivers/irqchip/irq-gic.c | 6 ------ 3 files changed, 16 deletions(-)