From patchwork Wed Aug 26 11:42:50 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lorenzo Pieralisi X-Patchwork-Id: 7076151 X-Patchwork-Delegate: rjw@sisk.pl Return-Path: X-Original-To: patchwork-linux-pm@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 616769F344 for ; Wed, 26 Aug 2015 11:42:58 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 84275205C7 for ; Wed, 26 Aug 2015 11:42:57 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.kernel.org (Postfix) with ESMTP id D039F2053A for ; Wed, 26 Aug 2015 11:42:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752794AbbHZLmx (ORCPT ); Wed, 26 Aug 2015 07:42:53 -0400 Received: from foss.arm.com ([217.140.101.70]:44609 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751859AbbHZLmx (ORCPT ); Wed, 26 Aug 2015 07:42:53 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 7551775; Wed, 26 Aug 2015 04:42:38 -0700 (PDT) Received: from red-moon (red-moon.cambridge.arm.com [10.1.203.137]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPSA id 5EE573F59B; Wed, 26 Aug 2015 04:42:50 -0700 (PDT) Date: Wed, 26 Aug 2015 12:42:50 +0100 From: Lorenzo Pieralisi To: Marc Zyngier Cc: "Anaczkowski, Lukasz" , "tglx@linutronix.de" , "mingo@redhat.com" , "hpa@zytor.com" , "x86@kernel.org" , "jason@lakedaemon.net" , "rjw@rjwysocki.net" , "Brown, Len" , "pavel@ucw.cz" , "linux-pm@vger.kernel.org" , "linux-kernel@vger.kernel.org" , "linux-acpi@vger.kernel.org" , Yinghai Lu Subject: Re: [PATCH] x86, acpi: Handle lapic/x2apic entries in MADT Message-ID: <20150826114250.GA11863@red-moon> References: <20150802134014.380415cd@arm.com> <1438626365-23709-1-git-send-email-lukasz.anaczkowski@intel.com> <1438626365-23709-2-git-send-email-lukasz.anaczkowski@intel.com> <55DD9838.20505@arm.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <55DD9838.20505@arm.com> User-Agent: Mutt/1.5.21 (2010-09-15) Sender: linux-pm-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-pm@vger.kernel.org X-Spam-Status: No, score=-8.3 required=5.0 tests=BAYES_00, RCVD_IN_DNSWL_HI, RP_MATCHES_RCVD, UNPARSEABLE_RELAY autolearn=unavailable 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 Hi Lukasz, On Wed, Aug 26, 2015 at 11:43:04AM +0100, Marc Zyngier wrote: > Hi Lukasz, > > On 26/08/15 08:04, Anaczkowski, Lukasz wrote: > > On Monday, August 3, 2015 8:26 PM > > Lukasz Anaczkowski wrote: > > > >> v2: Fixed ARM64 syntax error > > > > Hi Marc, > > > > Does this patch look ok now? No it does not, it seems to break arm64, I put together a fix below. I do not think the way you handle the count increment in acpi_parse_entries() is correct anyway, since you increment it only if max_entries != 0, which changes mainline behaviour. Thanks, Lorenzo -- >8 -- diff --git a/drivers/irqchip/irq-gic.c b/drivers/irqchip/irq-gic.c index d98b866..ca5591d 100644 --- a/drivers/irqchip/irq-gic.c +++ b/drivers/irqchip/irq-gic.c @@ -1101,7 +1101,7 @@ gic_v2_acpi_init(struct acpi_table_header *table) count = acpi_parse_entries(ACPI_SIG_MADT, sizeof(struct acpi_table_madt), table, &gic_proc, 1, 0); - if (count <= 0) { + if (gic_proc.count <= 0) { pr_err("No valid GICC entries exist\n"); return -EINVAL; } @@ -1117,7 +1117,7 @@ gic_v2_acpi_init(struct acpi_table_header *table) count = acpi_parse_entries(ACPI_SIG_MADT, sizeof(struct acpi_table_madt), table, &gic_proc, 1, 0); - if (count <= 0) { + if (gic_proc.count <= 0) { pr_err("No valid GICD entries exist\n"); return -EINVAL; } else if (count > 1) {