From patchwork Wed Jul 9 09:39:05 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 33270 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-ob0-f199.google.com (mail-ob0-f199.google.com [209.85.214.199]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 8A5E7208CF for ; Wed, 9 Jul 2014 09:39:55 +0000 (UTC) Received: by mail-ob0-f199.google.com with SMTP id va2sf40032072obc.6 for ; Wed, 09 Jul 2014 02:39:55 -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=S5XA9oTLevmTjpvAaSTh47S9jGpjmsu1qWaXyMPFPz0=; b=iJCuAM6iqnhbuN6fXBJktHDI/0xiy8Bly5SbL5zmOs2WvbGUYa62M2dUvClefx6Hgu pQFdG8IZU5LnbzxXjUJ3OdMgYT4v1lKcpZ/tdjBC05lzDa2x3LG7dp7s8uxzvDoeR0Ub a2j9chCiYaBwRXpS42+W5ki3IoieGYeH/7683Dz9VDFwfVuxvUt1CWEbxnxT0POTXia7 XuM/Q7D5QDUyXTn9oC4+LtbnN4zW4VOAgokF3i0E7LkXFP6iB6xsT8b3d58xWQUFfE3D AJJ64jyTsKE4QweDvE5+J1kzs5krmMVi1+hT9E1+WBdqmsYMoblATZHJu0+Vge5zl0o9 hDhA== X-Gm-Message-State: ALoCoQl1IAnxKlshI9wuKsS+/SJOvVJoK4Ivn+/OfA4cANg/XVXbCAUx7385lftRlmDKf7LzXY4I X-Received: by 10.43.149.193 with SMTP id kl1mr20491627icc.5.1404898795185; Wed, 09 Jul 2014 02:39:55 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.16.148 with SMTP id 20ls2454979qgb.78.gmail; Wed, 09 Jul 2014 02:39:55 -0700 (PDT) X-Received: by 10.58.188.199 with SMTP id gc7mr38820457vec.4.1404898795080; Wed, 09 Jul 2014 02:39:55 -0700 (PDT) Received: from mail-vc0-f181.google.com (mail-vc0-f181.google.com [209.85.220.181]) by mx.google.com with ESMTPS id dk1si18203560vdb.95.2014.07.09.02.39.55 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Wed, 09 Jul 2014 02:39:55 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.181 as permitted sender) client-ip=209.85.220.181; Received: by mail-vc0-f181.google.com with SMTP id il7so6694514vcb.12 for ; Wed, 09 Jul 2014 02:39:55 -0700 (PDT) X-Received: by 10.52.253.140 with SMTP id aa12mr10138907vdd.11.1404898795004; Wed, 09 Jul 2014 02:39:55 -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 tc5csp31751vcb; Wed, 9 Jul 2014 02:39:54 -0700 (PDT) X-Received: by 10.66.132.3 with SMTP id oq3mr40822673pab.33.1404898793609; Wed, 09 Jul 2014 02:39:53 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id d8si7128991pdk.59.2014.07.09.02.39.52; Wed, 09 Jul 2014 02:39:53 -0700 (PDT) Received-SPF: none (google.com: linux-kernel-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 S1755443AbaGIJjj (ORCPT + 28 others); Wed, 9 Jul 2014 05:39:39 -0400 Received: from mail-wg0-f51.google.com ([74.125.82.51]:36853 "EHLO mail-wg0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1755370AbaGIJjg (ORCPT ); Wed, 9 Jul 2014 05:39:36 -0400 Received: by mail-wg0-f51.google.com with SMTP id y10so2405846wgg.22 for ; Wed, 09 Jul 2014 02:39:35 -0700 (PDT) X-Received: by 10.180.36.225 with SMTP id t1mr10443426wij.38.1404898775710; Wed, 09 Jul 2014 02:39:35 -0700 (PDT) Received: from localhost ([213.122.173.130]) by mx.google.com with ESMTPSA id fg1sm17325762wic.17.2014.07.09.02.39.33 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Wed, 09 Jul 2014 02:39:34 -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 v2 2/3] ACPI: Don't use acpi_lapic in ACPI core code Date: Wed, 9 Jul 2014 17:39:05 +0800 Message-Id: <1404898746-6685-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1404898746-6685-1-git-send-email-hanjun.guo@linaro.org> References: <1404898746-6685-1-git-send-email-hanjun.guo@linaro.org> Sender: linux-kernel-owner@vger.kernel.org Precedence: list List-ID: X-Mailing-List: linux-kernel@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.220.181 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 if there is/are CPU entry/entries (Local APIC/SAPIC, GICC) in MADT, so introduce acpi_has_cpu_in_madt() 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..a1d91ab 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_has_cpu_in_madt(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..0ab4f9f 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_has_cpu_in_madt(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..1fdf5e0 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_has_cpu_in_madt()) { cpu0_initialized = 1; /* Handle UP system running SMP kernel, with no LAPIC in MADT */ if ((cpu_index == -1) && (num_online_cpus() == 1))