From patchwork Tue Sep 29 23:45:43 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 54280 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f199.google.com (mail-wi0-f199.google.com [209.85.212.199]) by patches.linaro.org (Postfix) with ESMTPS id 56CF423009 for ; Tue, 29 Sep 2015 23:46:09 +0000 (UTC) Received: by wicuu12 with SMTP id uu12sf13600631wic.2 for ; Tue, 29 Sep 2015 16:46:08 -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=xqGNU7cjBl1AW3vnva7JGyllHP53uJsyKxWLSHQBcuQ=; b=dyfCNNpfhhY5ufZhgqMwR4RUN6JdnyD1bGPYg2goWx9uUMCjAmZCHK0fRceHz/OCuA cXESaNQlFx7YKZLiWxhRbnuY8bi0YhrrPU0bN5j859YEI1Eyjcx4KsiY2WlHOQRRnCJh xidX3kldnki5NS554uv/haPM48gxOXrmUOaF9RDq2Gz4unl+wFosaqwBSJFg+PRnTyDN Tk8SWhdTF/xjxLaOySojvWPnEfo669X+Rhaphn5TX5kqqb2EmSbDs6D2mItmXO0DQq4X vPyH6bfPzBzUJKUFYMxwSl4dh7vwc7DJMVgGJp06jcDefvPEV4Ks8TJrolKSuOYfi5tZ wFCw== X-Gm-Message-State: ALoCoQlbo9mtbOQB9bGhQgZUVzS6/cUmRrt0XSo9VEgqYMc4HgjaCbz6LGg3RSJ66pwfi78ABbY9 X-Received: by 10.180.35.132 with SMTP id h4mr4293830wij.5.1443570368706; Tue, 29 Sep 2015 16:46:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.2.169 with SMTP id 9ls5359lav.54.gmail; Tue, 29 Sep 2015 16:46:08 -0700 (PDT) X-Received: by 10.112.16.67 with SMTP id e3mr172186lbd.5.1443570368558; Tue, 29 Sep 2015 16:46:08 -0700 (PDT) Received: from mail-la0-f45.google.com (mail-la0-f45.google.com. [209.85.215.45]) by mx.google.com with ESMTPS id n30si12133743lfi.14.2015.09.29.16.46.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 16:46:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.45 as permitted sender) client-ip=209.85.215.45; Received: by laer8 with SMTP id r8so26902973lae.2 for ; Tue, 29 Sep 2015 16:46:08 -0700 (PDT) X-Received: by 10.25.19.73 with SMTP id j70mr116829lfi.29.1443570368066; Tue, 29 Sep 2015 16:46:08 -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.59.35 with SMTP id w3csp2426858lbq; Tue, 29 Sep 2015 16:46:07 -0700 (PDT) X-Received: by 10.107.18.26 with SMTP id a26mr1614928ioj.150.1443570362442; Tue, 29 Sep 2015 16:46:02 -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 m8si737062igx.67.2015.09.29.16.46.02 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 16:46:02 -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 igbni9 with SMTP id ni9so19061510igb.0 for ; Tue, 29 Sep 2015 16:46:02 -0700 (PDT) X-Received: by 10.50.73.98 with SMTP id k2mr26033735igv.96.1443570362094; Tue, 29 Sep 2015 16:46:02 -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 r40sm12256182ioe.20.2015.09.29.16.46.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Tue, 29 Sep 2015 16:46:00 -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 v5 2/5] ACPI / ARM64: remove usage of BAD_MADT_ENTRY/BAD_MADT_GICC_ENTRY Date: Tue, 29 Sep 2015 17:45:43 -0600 Message-Id: <1443570346-15378-3-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1443570346-15378-1-git-send-email-al.stone@linaro.org> References: <1443570346-15378-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.45 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 Reviewed-and-tested-by: Sudeep Holla 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 | 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 #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 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.