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@linaro.org X-Patchwork-Id: 6591571 Return-Path: X-Original-To: patchwork-linux-arm@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id BDBF69F1C1 for ; Thu, 11 Jun 2015 19:49:01 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id D01BA2055D for ; Thu, 11 Jun 2015 19:49:00 +0000 (UTC) Received: from bombadil.infradead.org (bombadil.infradead.org [198.137.202.9]) (using TLSv1.2 with cipher DHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPS id D8ED320546 for ; Thu, 11 Jun 2015 19:48:59 +0000 (UTC) Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z38Qx-00056N-Cy; Thu, 11 Jun 2015 19:46:39 +0000 Received: from mail-ie0-f172.google.com ([209.85.223.172]) by bombadil.infradead.org with esmtps (Exim 4.80.1 #2 (Red Hat Linux)) id 1Z38QB-0004qY-FZ for linux-arm-kernel@lists.infradead.org; Thu, 11 Jun 2015 19:45:52 +0000 Received: by iebps5 with SMTP id ps5so11521374ieb.3 for ; Thu, 11 Jun 2015 12:45:30 -0700 (PDT) X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20130820; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=430MUhwVUIWe1Vmkn9IH/zAu9uQM+a2dDOzmF0Xm0rc=; b=QEVxNUyixhxjzG4V/cXi34lFpNkxAFd3q/pAR7TjtkqBJSIVp4q1DpGQWpsEpcFOGa 0dR1+ikP8AiiMfwDvczlHLK0Lxwj4TCrBu/dlNj2leWoEw51LzDKKO6IBaqQ2CX8ZtRm 9FuQY+72JmQ6n53v3sRCbcE0oEe8EpTBLMxw4Sg1PdkHLUxoXnKoMcHxrDVXqgz/OoI5 nUrYNIoJkzLqH0URQm6HUA/CfDiocItsEKwHPhp6GeGOwZb2Zq6gkdGuLpgSu4E8JtrJ F4prSR4vDcmBwqSI1DU4oE2XFWrphRE2RwYdtvlVWEKWIUhMzlFEOXOXRmnVgYs24Dlw WcIQ== X-Gm-Message-State: ALoCoQm2DDUdLAbSOZwdNpv/CjOVlBB4/RmkX0xPvBD5xCAYTjlOsAJRTAMkr0SPJBY5bDq6sgrS 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 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-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20150611_124551_596063_BB6FF560 X-CRM114-Status: GOOD ( 11.10 ) X-Spam-Score: 0.7 (/) Cc: patches@linaro.org, linaro-kernel@lists.linaro.org, linaro-acpi@lists.linaro.org X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.18-1 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Spam-Status: No, score=-1.7 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_MED, SUSPICIOUS_RECIPS,T_RP_MATCHES_RCVD,UNPARSEABLE_RELAY autolearn=no version=3.3.1 X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP 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; /*