From patchwork Mon Jul 6 23:16:48 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 50801 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 4F0FB229FC for ; Mon, 6 Jul 2015 23:17:09 +0000 (UTC) Received: by wguu7 with SMTP id u7sf54877937wgu.0 for ; Mon, 06 Jul 2015 16:17: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=+gCMEdhw+J+oQMkeJNcE6C2Xp5GslEJIF3bNL00+d4c=; b=F+lS/mkFgjNnAd5ZwjsQhBj/zUOlcV8ufMBUn8PdYpP7M2LkG37pMPqvPn5nMbe1GC L6VsxMy3JPi8ieKCwivJusNqiEzipw4SAXNF4LBrXkU5WEV02kYY6YXNkW+o0kyPw/LR rAiierVCwbaUFQmemLbwhQOFFxIQX0rQOKzAPAyW6E9X/Es1DeV6aF4XA4fkpDHtyiL6 mCMCsnDIoFhDcqE/s6l27o/4sRMiozEvGvkvMyOl+A+f5AkfhPX0GtOL6brZvMmexoiF 8yJdFJo7vVsY4JlDPY478wJTWB8g0aUSH/OLnyREbGx8dpAGBEpDOaOOQkkJijQZ2KTO 9ADg== X-Gm-Message-State: ALoCoQkjxpQzYduF2YCwe+EedkNqo3aBvLiSWEZ4VhWdCBrqCiKqmgdPSnrzE8HkNzuoHwnpq8ir X-Received: by 10.152.8.9 with SMTP id n9mr604649laa.1.1436224628565; Mon, 06 Jul 2015 16:17:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.37.69 with SMTP id w5ls762426laj.107.gmail; Mon, 06 Jul 2015 16:17:08 -0700 (PDT) X-Received: by 10.152.19.8 with SMTP id a8mr1153971lae.121.1436224628423; Mon, 06 Jul 2015 16:17:08 -0700 (PDT) Received: from mail-la0-f42.google.com (mail-la0-f42.google.com. [209.85.215.42]) by mx.google.com with ESMTPS id 4si16480266lar.151.2015.07.06.16.17.08 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 16:17:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.215.42 as permitted sender) client-ip=209.85.215.42; Received: by labgy5 with SMTP id gy5so21576801lab.2 for ; Mon, 06 Jul 2015 16:17:08 -0700 (PDT) X-Received: by 10.112.128.169 with SMTP id np9mr1169454lbb.73.1436224627943; Mon, 06 Jul 2015 16:17:07 -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 hn6csp2014013lbb; Mon, 6 Jul 2015 16:17:06 -0700 (PDT) X-Received: by 10.42.122.198 with SMTP id o6mr15803543icr.87.1436224623775; Mon, 06 Jul 2015 16:17:03 -0700 (PDT) Received: from mail-ig0-f175.google.com (mail-ig0-f175.google.com. [209.85.213.175]) by mx.google.com with ESMTPS id 69si18148392ior.53.2015.07.06.16.17.03 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 16:17:03 -0700 (PDT) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.213.175 as permitted sender) client-ip=209.85.213.175; Received: by igcqs7 with SMTP id qs7so21122295igc.0 for ; Mon, 06 Jul 2015 16:17:03 -0700 (PDT) X-Received: by 10.50.61.241 with SMTP id t17mr45665379igr.34.1436224622963; Mon, 06 Jul 2015 16:17:02 -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 y98sm5531581ioi.25.2015.07.06.16.17.00 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Mon, 06 Jul 2015 16:17:01 -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 v4 2/2] ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro Date: Mon, 6 Jul 2015 17:16:48 -0600 Message-Id: <1436224608-27754-3-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.4.3 In-Reply-To: <1436224608-27754-1-git-send-email-al.stone@linaro.org> References: <1436224608-27754-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.42 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; /*