From patchwork Fri Jun 27 03:49:25 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 32603 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-pd0-f197.google.com (mail-pd0-f197.google.com [209.85.192.197]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id B2779201EF for ; Fri, 27 Jun 2014 03:50:57 +0000 (UTC) Received: by mail-pd0-f197.google.com with SMTP id fp1sf15688703pdb.4 for ; Thu, 26 Jun 2014 20:50:57 -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=f1BfS6ry/ImQZf2xXKDSda8MZfH+2eAg2WIqueMOWLSdJh+xg70Qg6HOj9zSWrdDaH w0aA6RNpRrrW5ScEnnMejsMAYcAhK0opdtvIUiqAYKOkoos5KvRo1TFqsQ5deccid0XV 6w9xL/9pga/N+k2qgM2zip3hLsR4Zdb3AS4leNvT/d6rkYy6k4B3ChAirQYlIXz7pRMv D0cGJoIq6HN00LLZj767xR7+W7Z8FSfDshIoPjHj4ITey6RLQHXOIPhDTOluiWglDosD c7bdfVxuBXhQFW+HkelwuCjPG1m4Xcu9oy9cB3rID/g0QeGO9aDf/QvZL4iIZ4LN21Zu 58UA== X-Gm-Message-State: ALoCoQnXawYNWJGFtZI51bWeoynaiVKZTN9QoenFIWuW9cuqSK8h1uRelXYv+o+xhNAPPFWIv0z1 X-Received: by 10.68.253.66 with SMTP id zy2mr10632734pbc.1.1403841057002; Thu, 26 Jun 2014 20:50:57 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.48.112 with SMTP id n103ls467174qga.86.gmail; Thu, 26 Jun 2014 20:50:56 -0700 (PDT) X-Received: by 10.221.40.193 with SMTP id tr1mr17494263vcb.31.1403841056889; Thu, 26 Jun 2014 20:50:56 -0700 (PDT) Received: from mail-ve0-f174.google.com (mail-ve0-f174.google.com [209.85.128.174]) by mx.google.com with ESMTPS id ur5si5724092vec.61.2014.06.26.20.50.56 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:50:56 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.128.174 as permitted sender) client-ip=209.85.128.174; Received: by mail-ve0-f174.google.com with SMTP id jx11so4756720veb.33 for ; Thu, 26 Jun 2014 20:50:56 -0700 (PDT) X-Received: by 10.220.53.72 with SMTP id l8mr17626661vcg.16.1403841056814; Thu, 26 Jun 2014 20:50:56 -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 tc5csp76989vcb; Thu, 26 Jun 2014 20:50:56 -0700 (PDT) X-Received: by 10.66.192.73 with SMTP id he9mr27576183pac.88.1403841056117; Thu, 26 Jun 2014 20:50:56 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id xk1si12445840pab.68.2014.06.26.20.50.55; Thu, 26 Jun 2014 20:50:55 -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 S1752386AbaF0Duy (ORCPT + 8 others); Thu, 26 Jun 2014 23:50:54 -0400 Received: from mail-pa0-f49.google.com ([209.85.220.49]:49944 "EHLO mail-pa0-f49.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751836AbaF0Duw (ORCPT ); Thu, 26 Jun 2014 23:50:52 -0400 Received: by mail-pa0-f49.google.com with SMTP id lj1so4028394pab.22 for ; Thu, 26 Jun 2014 20:50:51 -0700 (PDT) X-Received: by 10.68.173.65 with SMTP id bi1mr27524501pbc.130.1403841051584; Thu, 26 Jun 2014 20:50:51 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id vf9sm12281423pbc.94.2014.06.26.20.50.46 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 26 Jun 2014 20:50:50 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" , Catalin Marinas , linux-arm-kernel@lists.infradead.org, linux-acpi@vger.kernel.org Cc: linux-kernel@vger.kernel.org, Arnd Bergmann , Bjorn Helgaas , rric@kernel.org, Grant Likely , Sudeep Holla , Mark Rutland , Charles.Garcia-Tobin@arm.com, lorenzo.pieralisi@arm.com, linaro-acpi@lists.linaro.org, Graeme Gregory , Hanjun Guo Subject: [PATCH v4 02/13] ACPI: Don't use acpi_lapic in ACPI core code Date: Fri, 27 Jun 2014 11:49:25 +0800 Message-Id: <1403840976-7456-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1403840976-7456-1-git-send-email-hanjun.guo@linaro.org> References: <1403840976-7456-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.174 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))