From patchwork Thu Sep 14 18:49:11 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 112631 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp1107342qgf; Thu, 14 Sep 2017 11:49:32 -0700 (PDT) X-Google-Smtp-Source: ADKCNb5gAaF6WjTMq+hlr4PgB2j/J0IYA9eNPAqbFLL9bl+1k+K1g+rFmyaPDu9DUwhUmqo+4WnM X-Received: by 10.101.67.72 with SMTP id k8mr21995138pgq.188.1505414972616; Thu, 14 Sep 2017 11:49:32 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505414972; cv=none; d=google.com; s=arc-20160816; b=b+xyC4X+14yuoUOYONH1HHpvffdoFYELl7izUMVGf/NDH+h8y2vPO9OOOIoSW6MvGU n1kHWGNMc+wzr/73oFkKcIEbyMc+EoB9gwNITr39DSAhJxSDti38IXAAgzwD0dUkKeIy OMcld1boJ7UcLkUnwWGhW6Af+h398pqYDGf7UQY8W4ZNCWISGkwZyVFM7QhL7oJ/HCaC Vz747VXEPY8NuZB/NcCg0l3wJekGdAS739BZ9u0ku95aBjRERCSyWGFDzo5i6jGf6fwS V49zKZNjbN8R2YL5s3pvOHfo+/Yi/d1oRcoKbZwgVnn4K10ZKhZNEK432VS2H8ISrWpZ WMyA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:references:in-reply-to:message-id:date :subject:cc:to:from:arc-authentication-results; bh=UA+lhWIkJgWNxFtaVloMW8CkR3afzwKtX7cGxoQXvGY=; b=Av7szHXtvECrlpKM0F2z9qr4Gwu3sSz34rxPsWOK50N9T1H20zLYzrnck5pt41Ppew zx1+eiSuPnKRkkXv6DKU8+Wa8NvxPWDSfgnhpV8rm62QSM2R2yfrHtnhWTBzTXxGqrOg gccP9SjZp1EVxV9Jo/FOkrJWfQGSJYUVoZHM82MC4HG+RUjgI8oMv4heUOCphzfBEFHh ksf3VR9WSXPo5ysPvFu0dCj999VcamU28B5nA/PQ2xeIZJbqwb0SAvgzyrN3u9EHp36Z RXnQHhkhV/sjxlkcBMF1eI8zCgIfNYzsKh4GjotE7yo3/DjjU2F8sDWb1x4b6sDkkp+o zDhw== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Return-Path: Received: from vger.kernel.org (vger.kernel.org. [209.132.180.67]) by mx.google.com with ESMTP id v3si12664320plk.436.2017.09.14.11.49.32; Thu, 14 Sep 2017 11:49:32 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) client-ip=209.132.180.67; Authentication-Results: mx.google.com; spf=pass (google.com: best guess record for domain of linux-acpi-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-acpi-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751710AbdINStb (ORCPT + 7 others); Thu, 14 Sep 2017 14:49:31 -0400 Received: from foss.arm.com ([217.140.101.70]:39588 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751612AbdINSta (ORCPT ); Thu, 14 Sep 2017 14:49:30 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.72.51.249]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 49D641715; Thu, 14 Sep 2017 11:49:30 -0700 (PDT) Received: from beelzebub.austin.arm.com (beelzebub.austin.arm.com [10.118.12.119]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 719393F483; Thu, 14 Sep 2017 11:49:29 -0700 (PDT) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, wangxiongfeng2@huawei.com, hanjun.guo@linaro.org, jhugo@codeaurora.org, john.garry@huawei.com, austinwc@codeaurora.org, sudeep.holla@arm.com, lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, Jeremy Linton Subject: [PATCH 6/6] arm64: topology: Enable ACPI/PPTT based CPU topology. Date: Thu, 14 Sep 2017 13:49:11 -0500 Message-Id: <20170914184918.20406-7-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170914184918.20406-1-jeremy.linton@arm.com> References: <20170914184918.20406-1-jeremy.linton@arm.com> Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org Propagate the topology information from the PPTT tree to the cpu_topology array. We can get the thread id, core_id and cluster_id by assuming certain levels of the PPTT tree correspond to those concepts. The package_id is flagged in the tree and can be found by passing an arbitrary large level to setup_acpi_cpu_topology() which terminates its search when it finds an ACPI node flagged as the physical package. If the tree doesn't contain enough levels to represent all of thread/core/cod/package then the package id will be used for the missing levels. Since arm64 machines can have 3 distinct topology levels, and the scheduler only handles sockets/threads well today, we compromise by collapsing into one of three diffrent configurations. These are thread/socket, thread/cluster or cluster/socket depending on whether the machine has threading and multisocket, threading in a single socket, or doesn't have threading. This code is loosely based on a combination of code from: Xiongfeng Wang John Garry Jeffrey Hugo Signed-off-by: Jeremy Linton --- arch/arm64/kernel/topology.c | 68 +++++++++++++++++++++++++++++++++++++++++++- include/linux/topology.h | 2 ++ 2 files changed, 69 insertions(+), 1 deletion(-) -- 2.13.5 -- To unsubscribe from this list: send the line "unsubscribe linux-acpi" in the body of a message to majordomo@vger.kernel.org More majordomo info at http://vger.kernel.org/majordomo-info.html diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 9147e5b6326d..8ee5cc5ba9bd 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -11,6 +11,7 @@ * for more details. */ +#include #include #include #include @@ -22,6 +23,7 @@ #include #include #include +#include #include #include @@ -304,6 +306,68 @@ static void __init reset_cpu_topology(void) } } +#ifdef CONFIG_ACPI +/* + * Propagate the topology information of the processor_topology_node tree to the + * cpu_topology array. + */ +static int __init parse_acpi_topology(void) +{ + u64 is_threaded; + int is_multisocket; + int cpu; + int topology_id; + /* set a large depth, to hit ACPI_PPTT_PHYSICAL_PACKAGE if one exists */ + const int max_topo = 0xFF; + + is_threaded = read_cpuid_mpidr() & MPIDR_MT_BITMASK; + is_multisocket = acpi_multisocket_count(); + if (is_multisocket < 0) + return is_multisocket; + + for_each_possible_cpu(cpu) { + topology_id = setup_acpi_cpu_topology(cpu, 0); + if (topology_id < 0) + return topology_id; + + if ((is_threaded) && (is_multisocket > 1)) { + /* MT per core, and multiple sockets */ + cpu_topology[cpu].thread_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, 1); + cpu_topology[cpu].core_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, 2); + cpu_topology[cpu].cluster_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, max_topo); + cpu_topology[cpu].package_id = topology_id; + } else if (is_threaded) { + /* mutltiple threads, but only a single socket */ + cpu_topology[cpu].thread_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, 1); + cpu_topology[cpu].core_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, 2); + cpu_topology[cpu].cluster_id = topology_id; + cpu_topology[cpu].package_id = topology_id; + } else { + /* no threads, clusters behave like threads */ + cpu_topology[cpu].thread_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, 1); + cpu_topology[cpu].core_id = topology_id; + cpu_topology[cpu].cluster_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, max_topo); + cpu_topology[cpu].package_id = topology_id; + } + } + return 0; +} + +#else +static int __init parse_acpi_topology(void) +{ + /*ACPI kernels should be built with PPTT support*/ + return -EINVAL; +} +#endif + void __init init_cpu_topology(void) { reset_cpu_topology(); @@ -312,6 +376,8 @@ void __init init_cpu_topology(void) * Discard anything that was parsed if we hit an error so we * don't use partial information. */ - if (of_have_populated_dt() && parse_dt_topology()) + if ((!acpi_disabled) && parse_acpi_topology()) + reset_cpu_topology(); + else if (of_have_populated_dt() && parse_dt_topology()) reset_cpu_topology(); } diff --git a/include/linux/topology.h b/include/linux/topology.h index 4660749a7303..08bf736be7c1 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -43,6 +43,8 @@ if (nr_cpus_node(node)) int arch_update_cpu_topology(void); +int setup_acpi_cpu_topology(unsigned int cpu, int level); +int acpi_multisocket_count(void); /* Conform to ACPI 2.0 SLIT distance definitions */ #define LOCAL_DISTANCE 10