From patchwork Thu Jun 11 19:45:11 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 49771 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 6E26B2460E for ; Thu, 11 Jun 2015 19:45:37 +0000 (UTC) Received: by wgme6 with SMTP id e6sf4192034wgm.3 for ; Thu, 11 Jun 2015 12:45:36 -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=430MUhwVUIWe1Vmkn9IH/zAu9uQM+a2dDOzmF0Xm0rc=; b=DD5EJcF7MNKYCtcIqG2BBohqc0Uhs4OwG3b1nFgboclYu31jytuxtBtezZhG3AHvWC cA27Q8yiw4pao/DVlNKjmmnppF5YtkAdDZTSHgjoPT8A2t8OxtcEDdsGLZCN6m3HhFbU XU6Vn4zzg9qeieyMHkFYwSU1xJlzzO2dN3Yk2GhlsISSvjh5Dn5T0YHR0HviPB/5tWrC Z1nidQJSUSa9AbVwJapmfgqZ7p9HICL4IebN2QjTgq+TXt68t6bbxzMAav5msMmmnN4T 5+67dwob89u+IzqSi4whsd3QS/b1HJj83cm47L0Vbzifho0SQWFkyGiKygp/FfsNEHjS tFzA== X-Gm-Message-State: ALoCoQn5uW3dBdWgq7xb8AExkamze8p5POe7jTFzDEQfM6qHNsR5QsWAV7YiJU+tiPczecOKHhed X-Received: by 10.180.198.172 with SMTP id jd12mr29066785wic.5.1434051935703; Thu, 11 Jun 2015 12:45:35 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.181.34 with SMTP id dt2ls440308lac.14.gmail; Thu, 11 Jun 2015 12:45:35 -0700 (PDT) X-Received: by 10.112.77.103 with SMTP id r7mr11487350lbw.63.1434051935521; Thu, 11 Jun 2015 12:45:35 -0700 (PDT) Received: from mail-la0-f49.google.com (mail-la0-f49.google.com. [209.85.215.49]) by mx.google.com with ESMTPS id x5si1471459lal.69.2015.06.11.12.45.35 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 12:45:35 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.49 as permitted sender) client-ip=209.85.215.49; Received: by lazv15 with SMTP id v15so9596865laz.3 for ; Thu, 11 Jun 2015 12:45:35 -0700 (PDT) X-Received: by 10.112.222.133 with SMTP id qm5mr11736458lbc.86.1434051935388; Thu, 11 Jun 2015 12:45:35 -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 hn6csp49842lbb; Thu, 11 Jun 2015 12:45:34 -0700 (PDT) X-Received: by 10.50.4.67 with SMTP id i3mr14884385igi.47.1434051930985; Thu, 11 Jun 2015 12:45:30 -0700 (PDT) Received: from mail-ig0-f180.google.com (mail-ig0-f180.google.com. [209.85.213.180]) by mx.google.com with ESMTPS id e5si1513872igz.54.2015.06.11.12.45.30 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 12:45:30 -0700 (PDT) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.213.180 as permitted sender) client-ip=209.85.213.180; Received: by igbpi8 with SMTP id pi8so60225543igb.0 for ; Thu, 11 Jun 2015 12:45:30 -0700 (PDT) X-Received: by 10.107.136.197 with SMTP id s66mr13914257ioi.65.1434051930186; Thu, 11 Jun 2015 12:45:30 -0700 (PDT) Received: from fidelio.ahs3.com (c-50-134-239-249.hsd1.co.comcast.net. [50.134.239.249]) by mx.google.com with ESMTPSA id z195sm1009685iod.33.2015.06.11.12.45.28 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 11 Jun 2015 12:45:29 -0700 (PDT) From: al.stone@linaro.org To: linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org Cc: linaro-acpi@lists.linaro.org, patches@linaro.org, linaro-kernel@lists.linaro.org Subject: [PATCH 3/3] ACPI / ARM64: use the new BAD_MADT_GICC_ENTRY macro Date: Thu, 11 Jun 2015 13:45:11 -0600 Message-Id: <1434051911-14665-4-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1434051911-14665-1-git-send-email-al.stone@linaro.org> References: <1434051911-14665-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.49 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: , From: Al Stone 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. Signed-off-by: Al Stone Reviewed-by: Hanjun Guo Reviewed-by: Graeme Gregory CC: Catalin Marinas CC: Will Deacon CC: Thomas Gleixner CC: Jason Cooper --- 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 4b2121b..80d5984 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; /*