From patchwork Thu Jun 18 22:36:08 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Al Stone X-Patchwork-Id: 50060 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 CD9CB228CC for ; Thu, 18 Jun 2015 22:36:28 +0000 (UTC) Received: by wgbhy7 with SMTP id hy7sf23469395wgb.3 for ; Thu, 18 Jun 2015 15:36:28 -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=TkNP3EzxG25KnqwIXMr7UAs7smfe/0keKOhJEZGb7+Y=; b=jGIZZvK3zweNE3PiikwRwctA5UUu655dHjcq4HhQzhdzJT2+MZG2tZjopSsv9mS74l eJnW9cMEe9wQROoiQYuK4chqWxHUIbsc/4+NRi1m2X4CPBm+QypDiityC9gDDQEYjHUR 4M+JdOEdy8kTa7FYaqR7YmhH/mH0uxQbdLbWGsqGkOrw3EPas8r2l+nwTcwUGpmIsMzs i7KAvAzHErPC5H+XeOM18vxsm642iGTyh77ZKLK/AKi8ZBIWEWAhFjuzAZbbnBt0e2YA WABi6wsrc5e2nUBqUI3YJuhRFxv9zywHUiyaes8oLSXAaZfpKTBVvbb1NdaZRwWqu2bH c5gQ== X-Gm-Message-State: ALoCoQmTLUf57tIUQ+EgCU4NLrNMm5MAzpAq4UpHWcgbuNqzsVTzGDgdYQpr9H2XbuTHKYanxsEN X-Received: by 10.112.9.100 with SMTP id y4mr12242623lba.20.1434666988056; Thu, 18 Jun 2015 15:36:28 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.152.87.164 with SMTP id az4ls88596lab.16.gmail; Thu, 18 Jun 2015 15:36:27 -0700 (PDT) X-Received: by 10.152.22.99 with SMTP id c3mr15263219laf.32.1434666987908; Thu, 18 Jun 2015 15:36:27 -0700 (PDT) Received: from mail-lb0-f175.google.com (mail-lb0-f175.google.com. [209.85.217.175]) by mx.google.com with ESMTPS id e7si7456779lbc.62.2015.06.18.15.36.27 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2015 15:36:27 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.217.175 as permitted sender) client-ip=209.85.217.175; Received: by lbbti3 with SMTP id ti3so61178015lbb.1 for ; Thu, 18 Jun 2015 15:36:27 -0700 (PDT) X-Received: by 10.112.209.106 with SMTP id ml10mr14707425lbc.112.1434666987774; Thu, 18 Jun 2015 15:36:27 -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 hn6csp148442lbb; Thu, 18 Jun 2015 15:36:26 -0700 (PDT) X-Received: by 10.50.79.129 with SMTP id j1mr527802igx.32.1434666986370; Thu, 18 Jun 2015 15:36:26 -0700 (PDT) Received: from mail-ie0-f177.google.com (mail-ie0-f177.google.com. [209.85.223.177]) by mx.google.com with ESMTPS id kt10si541701igb.35.2015.06.18.15.36.25 for (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2015 15:36:26 -0700 (PDT) Received-SPF: pass (google.com: domain of al.stone@linaro.org designates 209.85.223.177 as permitted sender) client-ip=209.85.223.177; Received: by iecrd14 with SMTP id rd14so64324013iec.3 for ; Thu, 18 Jun 2015 15:36:25 -0700 (PDT) X-Received: by 10.50.43.196 with SMTP id y4mr545441igl.14.1434666985611; Thu, 18 Jun 2015 15:36:25 -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 f82sm5828300ioj.37.2015.06.18.15.36.23 (version=TLSv1.2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Thu, 18 Jun 2015 15:36:24 -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 v2 3/3] ACPI / ARM64 : use the new BAD_MADT_GICC_ENTRY macro Date: Thu, 18 Jun 2015 16:36:08 -0600 Message-Id: <1434666968-1543-4-git-send-email-al.stone@linaro.org> X-Mailer: git-send-email 2.1.0 In-Reply-To: <1434666968-1543-1-git-send-email-al.stone@linaro.org> References: <1434666968-1543-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.217.175 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. Signed-off-by: Al Stone Reviewed-by: Hanjun Guo --- 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; /*