From patchwork Tue Sep 19 18:47:51 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 113056 Delivered-To: patch@linaro.org Received: by 10.140.106.117 with SMTP id d108csp5259692qgf; Tue, 19 Sep 2017 11:48:39 -0700 (PDT) X-Google-Smtp-Source: AOwi7QDd0TPHRuViPmorTECB+8B6CwEoZkMv3Em4K1AC63A++xn4Rpt5HjBHz3Nx65lVUMbfkwdC X-Received: by 10.101.68.65 with SMTP id e1mr2277380pgq.134.1505846919090; Tue, 19 Sep 2017 11:48:39 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1505846919; cv=none; d=google.com; s=arc-20160816; b=y+wtBVmWWSF8sgmLOw64+xejqRQgQ1L9QNqbh23139RBWdLe9ZiDe1X2DTtY53sbaG RZx1Md7s4hypaxn0jtM8V6xcYpRC0S9ifFj8ZYPpKcW6F2uNhfL1RpF4q7Y2vW+lpV7l BatX9UWMpkeAT6AZIJbDeil4oKjW1ycIDjKuJJn/iX+gSZW0bXrvXkp5jDD+qfPoqLZb 3m1rjgc4jICEbzrpfA/CjCAFAG7LEdm/pbdaDgBoGZNAiLwISb+FtLJ6lwQ4UjbEGQMT nDcKA82aMXdbMH0qEDfO2nhkwMeuB9vM1WytGAY1U7QAd1OTZMug/IWZf90pEDrKpmEW I6GA== 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=hmALH7v4njla2pm6RLzqxTBrjEqNrU7DCaQblOQ7gpQ=; b=OH1ExC3RBqy+j8/NghJrl7DWX7j1D4gH+vEqThIXC+OyeOeklZ0fFuTLKoH/eHefgX 4g7av1h4jbDfbzW7d9MqOrYnqplazvO7WJvZVScwKZW0Sz0DOtT+L4VkoYHYySChV/eS lQKhzVFTJUhEu0yLJz9qxRwi/ZGKaLbI7s4xZx0N9GnZgZVnbm4QXZi1MY0kZnJOFgJf +gRAZiRUkuJ9fuhi3Wjr44zS6LGb4st1R2fmX+j+6oIu/FyBUJ20/GtoT0Xo2cTIiVUc VnVQqyunUbZk4Q3QTFcUjQ0c46Zhk/t3emhAOdglvZyAficEQMeyoT5DSr6CgS5jjvs6 Fn+w== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: best guess record for domain of linux-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-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 k1si1880769pgc.473.2017.09.19.11.48.38; Tue, 19 Sep 2017 11:48:39 -0700 (PDT) Received-SPF: pass (google.com: best guess record for domain of linux-kernel-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-kernel-owner@vger.kernel.org designates 209.132.180.67 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1751848AbdISSsW (ORCPT + 26 others); Tue, 19 Sep 2017 14:48:22 -0400 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:54132 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1751568AbdISSsT (ORCPT ); Tue, 19 Sep 2017 14:48:19 -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 629EB169F; Tue, 19 Sep 2017 11:48:18 -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 235993F483; Tue, 19 Sep 2017 11:48:17 -0700 (PDT) From: Jeremy Linton To: linux-acpi@vger.kernel.org Cc: linux-arm-kernel@lists.infradead.org, sudeep.holla@arm.com, hanjun.guo@linaro.org, lorenzo.pieralisi@arm.com, rjw@rjwysocki.net, will.deacon@arm.com, catalin.marinas@arm.com, gregkh@linuxfoundation.org, mturquette@baylibre.com, sboyd@codeaurora.org, viresh.kumar@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-clk@vger.kernel.org, linux-pm@vger.kernel.org, jhugo@codeaurora.org, wangxiongfeng2@huawei.com, Jonathan.Zhang@cavium.com, ahs3@redhat.com, Jeremy Linton Subject: [PATCH v2 6/6] arm64: topology: Enable ACPI/PPTT based CPU topology. Date: Tue, 19 Sep 2017 13:47:51 -0500 Message-Id: <20170919184751.25110-7-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20170919184751.25110-1-jeremy.linton@arm.com> References: <20170919184751.25110-1-jeremy.linton@arm.com> Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@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 server/ACPI machines are more likely to be multisocket and NUMA, this patch also modifies the default clusters=sockets behavior for ACPI machines to sockets=sockets. DT machines continue to represent sockets as clusters. For ACPI machines, this results in a more normalized view of the topology. Cluster level scheduler decisions are still being made due to the "MC" level in the scheduler which has knowledge of cache sharing domains. 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 | 54 +++++++++++++++++++++++++++++++++++++++++++- include/linux/topology.h | 1 + 2 files changed, 54 insertions(+), 1 deletion(-) -- 2.13.5 diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 9147e5b6326d..42f3e7f28b2b 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,54 @@ 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 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; + + for_each_possible_cpu(cpu) { + topology_id = setup_acpi_cpu_topology(cpu, 0); + if (topology_id < 0) + return topology_id; + + if (is_threaded) { + 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 { + cpu_topology[cpu].thread_id = -1; + cpu_topology[cpu].core_id = topology_id; + topology_id = setup_acpi_cpu_topology(cpu, 1); + 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 +362,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..cbf2fb13bf92 100644 --- a/include/linux/topology.h +++ b/include/linux/topology.h @@ -43,6 +43,7 @@ if (nr_cpus_node(node)) int arch_update_cpu_topology(void); +int setup_acpi_cpu_topology(unsigned int cpu, int level); /* Conform to ACPI 2.0 SLIT distance definitions */ #define LOCAL_DISTANCE 10