From patchwork Thu Jul 24 13:00:17 2014 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Hanjun Guo X-Patchwork-Id: 34212 Return-Path: X-Original-To: linaro@patches.linaro.org Delivered-To: linaro@patches.linaro.org Received: from mail-wg0-f69.google.com (mail-wg0-f69.google.com [74.125.82.69]) by ip-10-151-82-157.ec2.internal (Postfix) with ESMTPS id 462EC20C7F for ; Thu, 24 Jul 2014 13:03:21 +0000 (UTC) Received: by mail-wg0-f69.google.com with SMTP id m15sf2104723wgh.4 for ; Thu, 24 Jul 2014 06:03:20 -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=TQ/4zByupL1G11SuCBPmEi32duabJQcIn2u4hPzh5u4=; b=bnYW9CD6l8IKHXGrZiYaFEtvAAjiOysPUAYXd7eu20C5D0bCOL/z09NCbjlI5fu2jG ZFd06X34p7LyqrKH2XGM55J6Sxl4oqNZZiSx6LfFAAPR69nci26ZOfKvC5H+nSwh/3lJ H7qS0EOapBOvQn/mYHNH/EgzKd3L65m4yfTsdac9beERB5qD+9H5JWKlTrnsLerN30bL w7VQMv2/JJ/lGUmZyPcfKmDyGmBOA3sgLxvXFCGjiIgqVGUkds3LBnC+tQlLiSK5tg6c 1b1862w8rWlKcb+bvv0C01zYaNqx4qz1bX6PqLSBnnIM/c3zwJd22IwQyq9ivWn4AeG9 t3nQ== X-Gm-Message-State: ALoCoQnckqY2RuJfBus4thpu2XvFTPHcPFVn2gsFkKWjd4zgH+Yh+EDLvXsK5Qyte5Vh08wDppxM X-Received: by 10.152.7.71 with SMTP id h7mr886838laa.2.1406206999881; Thu, 24 Jul 2014 06:03:19 -0700 (PDT) MIME-Version: 1.0 X-BeenThere: patchwork-forward@linaro.org Received: by 10.140.92.140 with SMTP id b12ls670277qge.88.gmail; Thu, 24 Jul 2014 06:03:19 -0700 (PDT) X-Received: by 10.52.243.135 with SMTP id wy7mr9967947vdc.82.1406206999701; Thu, 24 Jul 2014 06:03:19 -0700 (PDT) Received: from mail-vc0-f180.google.com (mail-vc0-f180.google.com [209.85.220.180]) by mx.google.com with ESMTPS id hk8si4851341vdb.79.2014.07.24.06.03.19 for (version=TLSv1 cipher=ECDHE-RSA-RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:03:19 -0700 (PDT) Received-SPF: pass (google.com: domain of patch+caf_=patchwork-forward=linaro.org@linaro.org designates 209.85.220.180 as permitted sender) client-ip=209.85.220.180; Received: by mail-vc0-f180.google.com with SMTP id ij19so4765028vcb.39 for ; Thu, 24 Jul 2014 06:03:19 -0700 (PDT) X-Received: by 10.220.15.8 with SMTP id i8mr11849334vca.45.1406206999083; Thu, 24 Jul 2014 06:03:19 -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 tc5csp362999vcb; Thu, 24 Jul 2014 06:03:18 -0700 (PDT) X-Received: by 10.68.93.65 with SMTP id cs1mr10116759pbb.52.1406206998183; Thu, 24 Jul 2014 06:03:18 -0700 (PDT) Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id wt2si5940461pbc.82.2014.07.24.06.03.15 for ; Thu, 24 Jul 2014 06:03:15 -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 S1759279AbaGXNC6 (ORCPT + 8 others); Thu, 24 Jul 2014 09:02:58 -0400 Received: from mail-pa0-f51.google.com ([209.85.220.51]:52512 "EHLO mail-pa0-f51.google.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1758633AbaGXNC5 (ORCPT ); Thu, 24 Jul 2014 09:02:57 -0400 Received: by mail-pa0-f51.google.com with SMTP id ey11so3864496pad.24 for ; Thu, 24 Jul 2014 06:02:56 -0700 (PDT) X-Received: by 10.68.95.225 with SMTP id dn1mr10130960pbb.126.1406206976268; Thu, 24 Jul 2014 06:02:56 -0700 (PDT) Received: from localhost ([183.247.163.231]) by mx.google.com with ESMTPSA id qn7sm20549446pac.42.2014.07.24.06.02.50 for (version=TLSv1.2 cipher=RC4-SHA bits=128/128); Thu, 24 Jul 2014 06:02:55 -0700 (PDT) From: Hanjun Guo To: Catalin Marinas , "Rafael J. Wysocki" , Mark Rutland Cc: Graeme Gregory , Arnd Bergmann , Grant Likely , Sudeep Holla , Will Deacon , Jason Cooper , Marc Zyngier , Bjorn Helgaas , Daniel Lezcano , Mark Brown , Robert Richter , Lv Zheng , Robert Moore , Lorenzo Pieralisi , Liviu Dudau , Randy Dunlap , Charles.Garcia-Tobin@arm.com, linux-acpi@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-kernel@vger.kernel.org, linaro-acpi-private@linaro.org, Hanjun Guo Subject: [PATCH 11/19] ACPI / processor: Make it possible to get CPU hardware ID via GICC Date: Thu, 24 Jul 2014 21:00:17 +0800 Message-Id: <1406206825-15590-12-git-send-email-hanjun.guo@linaro.org> X-Mailer: git-send-email 1.7.9.5 In-Reply-To: <1406206825-15590-1-git-send-email-hanjun.guo@linaro.org> References: <1406206825-15590-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.220.180 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: , Introduce a new function map_gicc_mpidr() to allow MPIDRs to be obtained from the GICC Structure introduced by ACPI 5.1. MPIDR is the CPU hardware ID as local APIC ID on x86 platform, so we use MPIDR not the GIC CPU interface ID to identify CPUs. Signed-off-by: Hanjun Guo --- arch/arm64/include/asm/acpi.h | 14 ++++++++++++++ arch/arm64/kernel/acpi.c | 21 ++++++++++++++++++++- drivers/acpi/processor_core.c | 36 ++++++++++++++++++++++++++++++++++++ 3 files changed, 70 insertions(+), 1 deletion(-) diff --git a/arch/arm64/include/asm/acpi.h b/arch/arm64/include/asm/acpi.h index 6240327..f40e137 100644 --- a/arch/arm64/include/asm/acpi.h +++ b/arch/arm64/include/asm/acpi.h @@ -12,6 +12,8 @@ #ifndef _ASM_ACPI_H #define _ASM_ACPI_H +#include + /* Basic configuration for ACPI */ #ifdef CONFIG_ACPI /* @@ -49,6 +51,18 @@ static inline void disable_acpi(void) acpi_noirq = 1; } +u32 pack_mpidr_into_32_bits(u64 mpidr); + +/* + * The ACPI processor driver for ACPI core code needs this macro + * to find out this cpu was already mapped (mapping from CPU hardware + * ID to CPU logical ID) or not. + * + * cpu_logical_map(cpu) is the mapping of MPIDR and the logical cpu, + * and MPIDR is the cpu hardware ID we needed. + */ +#define cpu_physical_id(cpu) pack_mpidr_into_32_bits(cpu_logical_map(cpu)) + /* * MADT must provide at least one GICC structure * for GIC initialization, so CPU will be diff --git a/arch/arm64/kernel/acpi.c b/arch/arm64/kernel/acpi.c index 2af6662..ef06e91 100644 --- a/arch/arm64/kernel/acpi.c +++ b/arch/arm64/kernel/acpi.c @@ -22,7 +22,6 @@ #include #include -#include #include /* @@ -279,6 +278,26 @@ static int __init parse_acpi(char *arg) } early_param("acpi", parse_acpi); +/* MPIDR value provided in GICC structure is 64 bits, but + * the acpi processor driver use the 32 bits cpu hardware + * ID (apic_id on intel platform) everywhere, it is pretty + * hard to modify the acpi processor driver to accept the + * 64 bits MPIDR value, at the same time, only 32 bits of + * the MPIDR is used in the 64 bits MPIDR, just pack the + * Affx fields into a single 32 bit identifier to accommodate + * the acpi processor drivers. + */ +u32 pack_mpidr_into_32_bits(u64 mpidr) +{ + /* + * Bits [0:7] Aff0; + * Bits [8:15] Aff1; + * Bits [16:23] Aff2; + * Bits [32:39] Aff3; + */ + return (u32) ((mpidr & 0xff00000000) >> 8) | mpidr; +} + /* * acpi_suspend_lowlevel() - save kernel state and suspend. * diff --git a/drivers/acpi/processor_core.c b/drivers/acpi/processor_core.c index 00f48d1..fa3d0ed 100644 --- a/drivers/acpi/processor_core.c +++ b/drivers/acpi/processor_core.c @@ -64,6 +64,37 @@ static int map_lsapic_id(struct acpi_subtable_header *entry, return 0; } +/* + * On ARM platform, MPIDR value is the hardware ID as apic ID + * on Intel platforms + */ +static int map_gicc_mpidr(struct acpi_subtable_header *entry, + int device_declaration, u32 acpi_id, int *mpidr) +{ + struct acpi_madt_generic_interrupt *gicc = + container_of(entry, struct acpi_madt_generic_interrupt, header); + + if (!(gicc->flags & ACPI_MADT_ENABLED)) + return -ENODEV; + + /* In the GIC interrupt model, logical processors are + * required to have a Processor Device object in the DSDT, + * so we should check device_declaration here + */ + if (device_declaration && (gicc->uid == acpi_id)) { + /* + * Only bits [0:7] Aff0, bits [8:15] Aff1, bits [16:23] Aff2 + * and bits [32:39] Aff3 are meaningful, so pack the Affx + * fields into a single 32 bit identifier to accommodate the + * acpi processor drivers. + */ + *mpidr = ((gicc->mpidr & 0xff00000000) >> 8) | gicc->mpidr; + return 0; + } + + return -EINVAL; +} + static int map_madt_entry(int type, u32 acpi_id) { unsigned long madt_end, entry; @@ -99,6 +130,9 @@ static int map_madt_entry(int type, u32 acpi_id) } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { if (!map_lsapic_id(header, type, acpi_id, &apic_id)) break; + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { + if (!map_gicc_mpidr(header, type, acpi_id, &apic_id)) + break; } entry += header->length; } @@ -129,6 +163,8 @@ static int map_mat_entry(acpi_handle handle, int type, u32 acpi_id) map_lapic_id(header, acpi_id, &apic_id); } else if (header->type == ACPI_MADT_TYPE_LOCAL_SAPIC) { map_lsapic_id(header, type, acpi_id, &apic_id); + } else if (header->type == ACPI_MADT_TYPE_GENERIC_INTERRUPT) { + map_gicc_mpidr(header, type, acpi_id, &apic_id); } exit: