From patchwork Wed Aug 19 22:07:25 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 52564 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f197.google.com (mail-wi0-f197.google.com [209.85.212.197]) by patches.linaro.org (Postfix) with ESMTPS id 782932156D for ; Wed, 19 Aug 2015 22:08:04 +0000 (UTC) Received: by wijp15 with SMTP id p15sf6401824wij.3 for ; Wed, 19 Aug 2015 15:08:03 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:mime-version:delivered-to:from:to:cc:subject :date:message-id:in-reply-to:references:x-original-sender :x-original-authentication-results:precedence:mailing-list:list-id :list-post:list-help:list-archive:list-unsubscribe; bh=cyUu2Qz03/kCBdAcOkfkqBJY4iG63SSZu6YZ0u9NLzo=; b=fc3CwrrWgMpEyoBAYAzyaUW/7Qf7B/h4XRbZJmelCi8g0SxEaP0Jd9R5jphD5WSuFe ynEJVGpo7T7/rYlo+SMvUTn+J4y8/pvaUfVgAN/wsZU8pZ1tKcpdnEW4JgLG/u+eudCR Y7otSpW8MFcmshO2hb/Yqi2oy77Tjev/TKmY6LCqYqro1b7kfnGTZwbSZMypN+3P6TWL LFrMRRFDT5Ac9zdoilL40aSLmf/Zy1mi2HxoA/J3SjquU/QkrYQTC/6/TTEES0hgPMEC tmpK1CvQfuKy1+icCHJTrqIWsFDZWSpVgYGNVqSB+/zMMoVyvbPf2rS2xGPL7Dl/7y3R C7yQ== X-Gm-Message-State: ALoCoQnAEYTT/9LV9976EQnEZvaXTmdPuRI9p5w8GS4xrqXhw3shjiK/9SZW11CIn6CJQa1rWnTr X-Received: by 10.180.79.66 with SMTP id h2mr1013921wix.3.1440022083732; Wed, 19 Aug 2015 15:08:03 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.23.74 with SMTP id k10ls91317laf.30.gmail; Wed, 19 Aug 2015 15:08:03 -0700 (PDT) X-Received: by 10.152.120.74 with SMTP id la10mr13495265lab.37.1440022083570; Wed, 19 Aug 2015 15:08:03 -0700 (PDT) Received: from mail-la0-f51.google.com (mail-la0-f51.google.com. [209.85.215.51]) by mx.google.com with ESMTPS id mm1si1964226lbb.69.2015.08.19.15.08.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2015 15:08:03 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) client-ip=209.85.215.51; Received: by lalv9 with SMTP id v9so11674641lal.0 for ; Wed, 19 Aug 2015 15:08:03 -0700 (PDT) X-Received: by 10.112.126.101 with SMTP id mx5mr14037478lbb.35.1440022083369; Wed, 19 Aug 2015 15:08:03 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patches@linaro.org Received: by 10.112.162.200 with SMTP id yc8csp636776lbb; Wed, 19 Aug 2015 15:08:02 -0700 (PDT) X-Received: by 10.107.46.162 with SMTP id u34mr16798879iou.124.1440022076808; Wed, 19 Aug 2015 15:07:56 -0700 (PDT) Received: from mail-ig0-f181.google.com (mail-ig0-f181.google.com. [209.85.213.181]) by mx.google.com with ESMTPS id l10si1758473ioi.106.2015.08.19.15.07.56 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2015 15:07:56 -0700 (PDT) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.213.181 as permitted sender) client-ip=209.85.213.181; Received: by igfj19 with SMTP id j19so538490igf.0 for ; Wed, 19 Aug 2015 15:07:56 -0700 (PDT) X-Received: by 10.50.112.168 with SMTP id ir8mr109549igb.81.1440022075988; Wed, 19 Aug 2015 15:07:55 -0700 (PDT) Received: from fidelio.ahs3.com (c-50-134-239-249.hsd1.co.comcast.net. [50.134.239.249]) by smtp.googlemail.com with ESMTPSA id f126sm1708666ioe.21.2015.08.19.15.07.54 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 19 Aug 2015 15:07:54 -0700 (PDT) From: Al Stone 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 , Will Deacon , Thomas Gleixner , Jason Cooper Subject: [PATCH v2 2/5] ACPI / ARM64: remove usage of BAD_MADT_ENTRY/BAD_MADT_GICC_ENTRY Date: Wed, 19 Aug 2015 16:07:25 -0600 Message-Id: <1440022048-6285-3-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1440022048-6285-1-git-send-email-al.stone@linaro.org> References: <1440022048-6285-1-git-send-email-al.stone@linaro.org> X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: al.stone@linaro.org X-Original-Authentication-Results: mx.google.com; spf=pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.51 as permitted sender) smtp.mailfrom=patch+caf_=patchwork-forward=linaro.org@linaro.org Precedence: list Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org List-ID: X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , 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 Acked-by: Catalin Marinas Acked-by: Marc Zyngier Cc: Will Deacon Cc: Thomas Gleixner Cc: Jason Cooper --- 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 208cec0..ed7e212 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -19,14 +19,6 @@ #include #include -/* 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 aa3e7b8..848c44c 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1064,9 +1064,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. @@ -1088,9 +1085,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; }