From patchwork Wed Jul 2 08:47:24 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 32958 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-qa0-f72.google.com (mail-qa0-f72.google.com [209.85.216.72]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 1657520560 for ; Wed, 2 Jul 2014 08:50:08 +0000 (UTC) Received: by mail-qa0-f72.google.com with SMTP id i13sf22762114qae.7 for ; Wed, 02 Jul 2014 01:50: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:sender:precedence:list-id :x-original-sender:x-original-authentication-results:mailing-list :list-post:list-help:list-archive:list-unsubscribe; bh=0NiHvXSBDyzRs6rj6ptH7Gsi7tsXg+CotUYPqkfuZyE=; b=jq1SJRcr99EZ37IR2/b/jyiccIJZZ/qjx2GBepY/Hb1iNLs0ftDArd46qfZfAuFNkn 0fG994riBu7mteWj5qXIMCA/vvqKxraYu9LB6s/mcCkqRYykbbzUsHkPPGvXcsP2MQ9B WeA7jj2DW5k7dGSsq1UMZxtYb+IiUtdfnGqpGVb7SOPKfF/NEcpVL7z79VZoGjJZiUb4 rVVv6H+MrkRlMAJ2HUOmb1P9HYIZjHxrL/cqtDVjEXEfC3A9khyfth2V5cSYRK2hYHDz GuWDWRZFrvpTukMkuzlOgRV8puDLz2JcXtDViwDZ94oFOtvY9uChXbbc3PphTrzJqxVt A2gQ== X-Gm-Message-State: ALoCoQlwjh8KQp4ZA9PSSTGGJtVUrqZ+9pfJTYKvgLlSU5IqRtdK7oTq9xZRU/B/AIu2po224cUd X-Received: by 10.58.94.166 with SMTP id dd6mr28733344veb.12.1404291008287; Wed, 02 Jul 2014 01:50:08 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.40.74 with SMTP id w68ls2314509qgw.53.gmail; Wed, 02 Jul 2014 01:50:08 -0700 (PDT) X-Received: by 10.220.59.65 with SMTP id k1mr48219376vch.22.1404291008205; Wed, 02 Jul 2014 01:50:08 -0700 (PDT) Received: from mail-ve0-f175.google.com (mail-ve0-f175.google.com [209.85.128.175]) by mx.google.com with ESMTPS id lt5si12613952vcb.103.2014.07.02.01.50.08 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 02 Jul 2014 01:50:08 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.175 as permitted sender) client-ip=209.85.128.175; Received: by mail-ve0-f175.google.com with SMTP id jx11so10798633veb.20 for ; Wed, 02 Jul 2014 01:50:08 -0700 (PDT) X-Received: by 10.58.76.225 with SMTP id n1mr653765vew.32.1404291008131; Wed, 02 Jul 2014 01:50:08 -0700 (PDT) X-Forwarded-To: patchwork-forward@linaro.org X-Forwarded-For: patch@linaro.org patchwork-forward@linaro.org Delivered-To: patch@linaro.org Received: by 10.221.37.5 with SMTP id tc5csp277328vcb; Wed, 2 Jul 2014 01:50:07 -0700 (PDT) X-Received: by 10.66.139.132 with SMTP id qy4mr2378347pab.133.1404291006610; Wed, 02 Jul 2014 01:50:06 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id sy3si29593471pab.158.2014.07.02.01.50.05; Wed, 02 Jul 2014 01:50:06 -0700 (PDT) Received-SPF: none (google.com: linux-acpi-owner@vger.kernel.org does not designate permitted sender hosts) client-ip=209.132.180.67; Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1752702AbaGBIt7 (ORCPT + 8 others); Wed, 2 Jul 2014 04:49:59 -0400 Received: from mail-pa0-f52.google.com ([209.85.220.52]:46900 "EHLO mail-pa0-f52.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752238AbaGBIsb (ORCPT ); Wed, 2 Jul 2014 04:48:31 -0400 Received: by mail-pa0-f52.google.com with SMTP id eu11so12080839pac.25 for ; Wed, 02 Jul 2014 01:48:31 -0700 (PDT) X-Received: by 10.68.96.194 with SMTP id du2mr18523694pbb.105.1404290911217; Wed, 02 Jul 2014 01:48:31 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id tf10sm36142807pbc.70.2014.07.02.01.48.27 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 02 Jul 2014 01:48:30 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: Catalin Marinas , Graeme Gregory , Tony Luck , Thomas Gleixner , linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi@lists.linaro.org, Hanjun Guo Subject: [PATCH 2/4] ACPI: Don't use acpi_lapic in ACPI core code Date: Wed, 2 Jul 2014 16:47:24 +0800 Message-Id: <1404290847-7671-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404290847-7671-1-git-send-email-hanjun.guo@linaro.org> References: <1404290847-7671-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-acpi-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-acpi@vger.kernel.org X-Removed-Original-Auth: Dkim didn't pass. X-Original-Sender: hanjun.guo@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.128.175 as permitted sender) smtp.mail=patch+caf_=patchwork-forward=linaro.org@linaro.org Mailing-list: list patchwork-forward@linaro.org; contact patchwork-forward+owners@linaro.org X-Google-Group-Id: 836684582541 List-Post: , List-Help: , List-Archive: List-Unsubscribe: , From: Graeme Gregory Now ARM64 support is being added to ACPI so architecture specific values can not be used in core ACPI code. Following on the patch "ACPI / processor: Check if LAPIC is present during initialization" which uses acpi_lapic in acpi_processor.c, on ARM64 platform, GIC is used instead of local APIC, so acpi_lapic is not a suitable value for ARM64. What is actually important at this point is the SMPness of the system, so introduce acpi_arch_is_smp() to be arch specific and generic. Signed-off-by: Graeme Gregory Signed-off-by: Hanjun Guo --- arch/ia64/include/asm/acpi.h | 5 +++++ arch/x86/include/asm/acpi.h | 5 +++++ drivers/acpi/acpi_processor.c | 2 +- 3 files changed, 11 insertions(+), 1 deletion(-) diff --git a/arch/ia64/include/asm/acpi.h b/arch/ia64/include/asm/acpi.h index 75dc59a..2fc0757 100644 --- a/arch/ia64/include/asm/acpi.h +++ b/arch/ia64/include/asm/acpi.h @@ -40,6 +40,11 @@ extern int acpi_lapic; #define acpi_noirq 0 /* ACPI always enabled on IA64 */ #define acpi_pci_disabled 0 /* ACPI PCI always enabled on IA64 */ #define acpi_strict 1 /* no ACPI spec workarounds on IA64 */ + +static inline bool acpi_arch_is_smp(void) +{ + return acpi_lapic; +} #endif #define acpi_processor_cstate_check(x) (x) /* no idle limits on IA64 :) */ static inline void disable_acpi(void) { } diff --git a/arch/x86/include/asm/acpi.h b/arch/x86/include/asm/acpi.h index e06225e..939d377 100644 --- a/arch/x86/include/asm/acpi.h +++ b/arch/x86/include/asm/acpi.h @@ -121,6 +121,11 @@ static inline void arch_acpi_set_pdc_bits(u32 *buf) buf[2] &= ~(ACPI_PDC_C_C2C3_FFH); } +static inline bool acpi_arch_is_smp(void) +{ + return acpi_lapic; +} + #else /* !CONFIG_ACPI */ #define acpi_lapic 0 diff --git a/drivers/acpi/acpi_processor.c b/drivers/acpi/acpi_processor.c index 1c08574..8622a0e 100644 --- a/drivers/acpi/acpi_processor.c +++ b/drivers/acpi/acpi_processor.c @@ -268,7 +268,7 @@ static int acpi_processor_get_info(struct acpi_device *device) pr->apic_id = apic_id; cpu_index = acpi_map_cpuid(pr->apic_id, pr->acpi_id); - if (!cpu0_initialized && !acpi_lapic) { + if (!cpu0_initialized && !acpi_arch_is_smp()) { cpu0_initialized = 1; /* Handle UP system running SMP kernel, with no LAPIC in MADT */ if ((cpu_index == -1) && (num_online_cpus() == 1))