From patchwork Thu Jul 2 23:48:36 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 50607 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wi0-f200.google.com (mail-wi0-f200.google.com [209.85.212.200]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id C045C214B3 for ; Thu, 2 Jul 2015 23:49:00 +0000 (UTC) Received: by wiar9 with SMTP id r9sf27596874wia.1 for ; Thu, 02 Jul 2015 16:49:00 -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=+gCMEdhw+J+oQMkeJNcE6C2Xp5GslEJIF3bNL00+d4c=; b=RNYmWQMvWd1EQy3qTlvkj5GUT8/mKbPc/Cf01daNOAHDEIYE06hbHk9XkItZ8krde0 tMrmGynDG8/KP/bmY9zJscoBMOLHMyK52W2NSfa7mJLMnz7X3mOGkdXJkxnR5Cq71oUG 1FNcD8ZbQOD5ZWzYBKx8IZ5FBgFkvjZKU6Xgn9/1mZvaoI1agtSi3cnXwxDfNEfO7/w7 eFYdJrckSTx5O8suV0PoG6VQiRcVyf8ULBzvtyUR2OqMRqO4EtB8ECb+hbedbG5K12O0 iDAdQwyMuJrGM1+ph9Eqs6a5QcDOO9hMYAho491LVS/HeSy1HEawzQwcbICL/FXrnZd9 OTEA== X-Gm-Message-State: ALoCoQl6vYNc5ojNDTIrfJCA325uzrJ1Ut3/8NmxrcSU7JmyoFzaCE6awfsKRZ3gcI+XusRcfkuQ X-Received: by 10.180.83.33 with SMTP id n1mr1085472wiy.4.1435880940130; Thu, 02 Jul 2015 16:49:00 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.30.6 with SMTP id o6ls380819lah.56.gmail; Thu, 02 Jul 2015 16:48:59 -0700 (PDT) X-Received: by 10.152.88.68 with SMTP id be4mr30401253lab.76.1435880939969; Thu, 02 Jul 2015 16:48:59 -0700 (PDT) Received: from mail-la0-f53.google.com (mail-la0-f53.google.com. [209.85.215.53]) by mx.google.com with ESMTPS id qg4si5753358lbb.25.2015.07.02.16.48.59 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 16:48:59 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.53 as permitted sender) client-ip=209.85.215.53; Received: by lagh6 with SMTP id h6so70657072lag.2 for ; Thu, 02 Jul 2015 16:48:59 -0700 (PDT) X-Received: by 10.152.206.75 with SMTP id lm11mr32361314lac.41.1435880939736; Thu, 02 Jul 2015 16:48:59 -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.108.230 with SMTP id hn6csp794478lbb; Thu, 2 Jul 2015 16:48:58 -0700 (PDT) X-Received: by 10.50.225.65 with SMTP id ri1mr17751253igc.47.1435880934861; Thu, 02 Jul 2015 16:48:54 -0700 (PDT) Received: from mail-ig0-f179.google.com (mail-ig0-f179.google.com. [209.85.213.179]) by mx.google.com with ESMTPS id v10si7523751icm.89.2015.07.02.16.48.54 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 16:48:54 -0700 (PDT) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.213.179 as permitted sender) client-ip=209.85.213.179; Received: by igcsj18 with SMTP id sj18so175120668igc.1 for ; Thu, 02 Jul 2015 16:48:54 -0700 (PDT) X-Received: by 10.42.85.73 with SMTP id p9mr14747310icl.80.1435880934059; Thu, 02 Jul 2015 16:48:54 -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 h2sm6550906igv.2.2015.07.02.16.48.51 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 02 Jul 2015 16:48:52 -0700 (PDT) From: Al Stone To: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org Cc: rjw@rjwysocki.net, lenb@kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, tglx@linutronix.de, jason@lakedaemon.net, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, linaro-kernel@lists.linaro.org, patches@linaro.org Subject: [PATCH v3 3/3] ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro Date: Thu, 2 Jul 2015 17:48:36 -0600 Message-Id: <1435880916-2153-4-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1435880916-2153-1-git-send-email-al.stone@linaro.org> References: <1435880916-2153-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.53 as permitted sender) smtp.mail=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: , For those parts of the arm64 ACPI code that need to check GICC subtables in the MADT, use the new BAD_MADT_GICC_ENTRY macro instead of the previous BAD_MADT_ENTRY. The new macro takes into account differences in the size of the GICC subtable that the old macro did not; this caused failures even though the subtable entries are valid. Fixes: aeb823bbacc2 (ACPICA: ACPI 6.0: Add changes for FADT table.) Signed-off-by: Al Stone Reviewed-by: Hanjun Guo Acked-by: Will Deacon --- arch/arm64/kernel/smp.c | 2 +- drivers/irqchip/irq-gic.c | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/arch/arm64/kernel/smp.c b/arch/arm64/kernel/smp.c index a1883bf..25fc88c 100644 --- a/arch/arm64/kernel/smp.c +++ b/arch/arm64/kernel/smp.c @@ -438,7 +438,7 @@ 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_ENTRY(processor, end)) + 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 8d7e1c8..4dd8826 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1055,7 +1055,7 @@ gic_acpi_parse_madt_cpu(struct acpi_subtable_header *header, processor = (struct acpi_madt_generic_interrupt *)header; - if (BAD_MADT_ENTRY(processor, end)) + if (BAD_MADT_GICC_ENTRY(processor, end)) return -EINVAL; /*