From patchwork Thu Nov 9 21:03:10 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 118484 Delivered-To: patch@linaro.org Received: by 10.80.225.132 with SMTP id k4csp1394410edl; Thu, 9 Nov 2017 13:04:18 -0800 (PST) X-Google-Smtp-Source: ABhQp+Q+5sJHboik7GnCjn+aL3vYo+YBpQ5KXBOVSf8hDC2EU/qzWsV5w8JcqUQg5soE+AINTruz X-Received: by 10.159.195.73 with SMTP id z9mr1720517pln.346.1510261458067; Thu, 09 Nov 2017 13:04:18 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1510261458; cv=none; d=google.com; s=arc-20160816; b=LPLuOSpRrvn6n3KUAg8c/WX8dzxqjQ1sRA2g3hH20sIQkX5axnV9t/9xUdgbT42vpK 4fpROd5wM4WyaIhS3BbW8o34OIfnMDSDrt39KLzs4JAp8B480/kbTihURemMxNqLcPW9 0qvIdtYLxyJsmTDr79epwb043ejfZ91dGpyXHnT14zOIfSVsBj7nKrOsvm36EpZQGxoW JTyR5sOhSrdPwbVD1xU+UjZ1CaVUrUXgvJgDp10kz1nNfzs+XL94+p2Dc7ye/JStCWUW 6jMc+3NpzLkmnhqHlXrRDqBeyRzQIJP/a2d/Gtf5PeBXVYd/S6mlR9uKZ/v6vvIV0SeG doOg== 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=+XMuXWiHSDyNVn4t4/cjEon5h1XWhdOL0VRHXpBaOoY=; b=RHesEIvEPVAjTnbJ4bKC/xM+gwVwkH18aTlb6Pa6vS9gVgGhouJiSjQTE4jOwBkUsB 61Id3biMOq7aSbFSJhPxEG0P3g9BVElEcNUAbRjv7z2llm4WyPwWffIy23NRtR3UOc4h opTOq4BEwe7z2hxNOmef1mK0nFgFo/zwSTNYahYPe3PvilPwIuGWY9Z4rdf2+XCLLn7g l4CtbVgI6sHI7h6J8zkYGVxOze7rfjhhY0lVjtw+dtgkUAO7lBwyRGQS4VJfiTtd2BUO SDnQIAOm5SFS4mES9vGJaxXDJdtnJ7Fk+obmHBCVBsJflP3DPPCgDV8RCfJC1tKxjsMP Yizg== 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 s36si7162871pld.67.2017.11.09.13.04.17; Thu, 09 Nov 2017 13:04:18 -0800 (PST) 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 S1755077AbdKIVEP (ORCPT + 26 others); Thu, 9 Nov 2017 16:04:15 -0500 Received: from foss.arm.com ([217.140.101.70]:51778 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1754826AbdKIVDm (ORCPT ); Thu, 9 Nov 2017 16:03:42 -0500 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 8A7D816A3; Thu, 9 Nov 2017 13:03:42 -0800 (PST) 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 8A6683F3DF; Thu, 9 Nov 2017 13:03:41 -0800 (PST) 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, viresh.kumar@linaro.org, mark.rutland@arm.com, linux-kernel@vger.kernel.org, linux-pm@vger.kernel.org, jhugo@codeaurora.org, wangxiongfeng2@huawei.com, Jonathan.Zhang@cavium.com, ahs3@redhat.com, Jayachandran.Nair@cavium.com, austinwc@codeaurora.org, lenb@kernel.org, robert.moore@intel.com, lv.zheng@intel.com, devel@acpica.org, Jeremy Linton Subject: [PATCH v4 8/9] arm64: topology: Enable ACPI/PPTT based CPU topology. Date: Thu, 9 Nov 2017 15:03:10 -0600 Message-Id: <20171109210311.25655-9-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20171109210311.25655-1-jeremy.linton@arm.com> References: <20171109210311.25655-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 | 47 +++++++++++++++++++++++++++++++++++++++++++- include/linux/topology.h | 2 ++ 2 files changed, 48 insertions(+), 1 deletion(-) -- 2.13.5 diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 74a8a5173a35..198714aca9e8 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 @@ -300,6 +302,47 @@ 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; + + is_threaded = read_cpuid_mpidr() & MPIDR_MT_BITMASK; + + for_each_possible_cpu(cpu) { + topology_id = find_acpi_cpu_topology(cpu, 0); + if (topology_id < 0) + return topology_id; + + if (is_threaded) { + cpu_topology[cpu].thread_id = topology_id; + topology_id = find_acpi_cpu_topology(cpu, 1); + cpu_topology[cpu].core_id = topology_id; + topology_id = find_acpi_cpu_topology_package(cpu); + cpu_topology[cpu].physical_id = topology_id; + } else { + cpu_topology[cpu].thread_id = -1; + cpu_topology[cpu].core_id = topology_id; + topology_id = find_acpi_cpu_topology_package(cpu); + cpu_topology[cpu].physical_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) { @@ -309,6 +352,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 cb0775e1ee4b..170ce87edd88 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 find_acpi_cpu_topology(unsigned int cpu, int level); +int find_acpi_cpu_topology_package(unsigned int cpu); /* Conform to ACPI 2.0 SLIT distance definitions */ #define LOCAL_DISTANCE 10