From patchwork Fri Jul 18 10:02:53 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 33827 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-oa0-f70.google.com (mail-oa0-f70.google.com [209.85.219.70]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 461F820CA0 for ; Fri, 18 Jul 2014 10:03:51 +0000 (UTC) Received: by mail-oa0-f70.google.com with SMTP id eb12sf13226779oac.5 for ; Fri, 18 Jul 2014 03:03:50 -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=X5upvijQ4bi2ZrFZWnEDyevcHgNjsr4JsI3HANqteNlcTY8XcpfsGFZhb5iWl+0qI+ dyFd5uImiyatNcAjSfXinTNy1spPwJWKX7vakJYw8nszNQyl0Z+bv+tNYxuqhJvEhmhA a2HQJGHOQ1XBp1f0j5MOLjH5Yf85m4wgsG5PlXss+i4O7vG9TlnCh2Y+xwNX5A5vq8R4 S0yvFM1zUpoWf7wybEcu2ZxZgGSU4JKcuD2IitsuVER0aVYDzq59a5bbXA4BkbuO8uji OGHLDbsNHBav6SoG297YiZVfWBu4SJ0RFvOnWZUhSW6PvrMippKVx9DOOvCax+gJHghV Ooog== X-Gm-Message-State: ALoCoQmIDbZrI8p93CNPID/6O2mpVifamAtFAkDt5B0jcWYIObKR9gf/slLEtaWZ+sO5/Qmp/3/a X-Received: by 10.50.98.69 with SMTP id eg5mr2449478igb.7.1405677830360; Fri, 18 Jul 2014 03:03:50 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.46.99 with SMTP id j90ls942594qga.49.gmail; Fri, 18 Jul 2014 03:03:50 -0700 (PDT) X-Received: by 10.52.92.49 with SMTP id cj17mr3132398vdb.89.1405677830275; Fri, 18 Jul 2014 03:03:50 -0700 (PDT) Received: from mail-vc0-f176.google.com (mail-vc0-f176.google.com [209.85.220.176]) by mx.google.com with ESMTPS id ur3si5111469vcb.43.2014.07.18.03.03.50 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Fri, 18 Jul 2014 03:03:50 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.176 as permitted sender) client-ip=209.85.220.176; Received: by mail-vc0-f176.google.com with SMTP id id10so2293530vcb.7 for ; Fri, 18 Jul 2014 03:03:50 -0700 (PDT) X-Received: by 10.221.47.9 with SMTP id uq9mr4012737vcb.48.1405677830199; Fri, 18 Jul 2014 03:03:50 -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 tc5csp107901vcb; Fri, 18 Jul 2014 03:03:49 -0700 (PDT) X-Received: by 10.66.136.131 with SMTP id qa3mr3455277pab.77.1405677828878; Fri, 18 Jul 2014 03:03:48 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id cm7si2675138pdb.489.2014.07.18.03.03.48; Fri, 18 Jul 2014 03:03:48 -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 S964886AbaGRKDi (ORCPT + 23 others); Fri, 18 Jul 2014 06:03:38 -0400 Received: from mail-pd0-f178.google.com ([209.85.192.178]:57177 "EHLO mail-pd0-f178.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S934383AbaGRKDf (ORCPT ); Fri, 18 Jul 2014 06:03:35 -0400 Received: by mail-pd0-f178.google.com with SMTP id w10so4779862pde.37 for ; Fri, 18 Jul 2014 03:03:35 -0700 (PDT) X-Received: by 10.70.44.168 with SMTP id f8mr3484066pdm.97.1405677815325; Fri, 18 Jul 2014 03:03:35 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id r1sm6803461pdo.51.2014.07.18.03.03.29 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Fri, 18 Jul 2014 03:03:32 -0700 (PDT) From: Hanjun Guo To: "Rafael J. Wysocki" Cc: Catalin Marinas , Graeme Gregory , Tony Luck , "H. Peter Anvin" , 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 v3 2/3] ACPI: Don't use acpi_lapic in ACPI core code Date: Fri, 18 Jul 2014 18:02:53 +0800 Message-Id: <1405677774-16787-3-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1405677774-16787-1-git-send-email-hanjun.guo@linaro.org> References: <1405677774-16787-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.176 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))