From patchwork Sat Jan 13 00:59:19 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 124398 Delivered-To: patch@linaro.org Received: by 10.140.22.227 with SMTP id 90csp71913qgn; Fri, 12 Jan 2018 17:01:02 -0800 (PST) X-Google-Smtp-Source: ACJfBotrpZx2vbsnkMW6Gs39HELR8a2B/dTPX3IWeYsXkMVWH3E1CNjpPNaUafJ1yVAyKdlQ7WXB X-Received: by 10.84.136.36 with SMTP id 33mr11062076plk.157.1515805262189; Fri, 12 Jan 2018 17:01:02 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1515805262; cv=none; d=google.com; s=arc-20160816; b=QvQ0QKqlmUquJZaVHFU2I21eAciIa4PmJ9SXIA4PdfR1TsqCpEy7saMT1FxTnGpaGV 1Q9WnWYqQ+2sGcJE+N3n4z+20W8rhJf649M0wgmrDhTJ/GcIe3W6709ObOQrNRbcgavw Ecr3hRbh8e4tSOGctU3XsXYpBkm79omGIpmpcVB0S8DC59BYNxLo+qS5bBV2qIkr2QoI Mj8DxPPOXILEuFrd9MQpbPnmenquTdFhv9Mkh7EqZQ1OaCUgp3Q6mhLWSdJkOENnYh40 Qh1+chRg3oWF1OeBsKPxIwh2Z8PQRE2iTfQPVWJadiOqCOUEUs4wG7NNVjr5jtgzNhDs I0Cw== 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=WlomIW4bfcNKpfi6OVsyFRfzUFAKOCNpm1UOyyV05mk=; b=xKuIj1j/MI7DtkEwSWeL3MhQ3Cm1oGqxIklOF6whV/MtuCHzaRXGryU0JM+T1dP5qa 7WcGkp2KJwYDRB7flikar6/81Bgk1sRjf//XYeQeto3lpM9swu1uwYIdDpWGGCjtxB3c RTLbJUFe3r7AsZt5wMD8rwaW30FqU9BO13nazoxcgq9qJ36CZWl73eWl0edGny+MEvkL xoAsoaYInTHQw7pB43HoM2zqcVlzUBEcTiL2lrBFYtUXZNHKGUS/oTh7Q/ak243+YTb+ RHTEJbSxRRS5SIYRYT3RqoRtR/zZozWTYOCnuj+2rCoq6bffLekF7IKLar4DS/ENLziG frDA== 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 v85si3309345pgb.353.2018.01.12.17.01.01; Fri, 12 Jan 2018 17:01:02 -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 S965578AbeAMBA7 (ORCPT + 28 others); Fri, 12 Jan 2018 20:00:59 -0500 Received: from usa-sjc-mx-foss1.foss.arm.com ([217.140.101.70]:53962 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S965523AbeAMBA5 (ORCPT ); Fri, 12 Jan 2018 20:00:57 -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 AC569165D; Fri, 12 Jan 2018 17:00:56 -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 AC8E03F487; Fri, 12 Jan 2018 17:00:55 -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, vkilari@codeaurora.org, morten.rasmussen@arm.com, Jeremy Linton , Juri Lelli Subject: [PATCH v6 11/12] arm64: topology: enable ACPI/PPTT based CPU topology Date: Fri, 12 Jan 2018 18:59:19 -0600 Message-Id: <20180113005920.28658-12-jeremy.linton@arm.com> X-Mailer: git-send-email 2.13.5 In-Reply-To: <20180113005920.28658-1-jeremy.linton@arm.com> References: <20180113005920.28658-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 calling find_acpi_cpu_topology_package() 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 the requested levels then the root node will be returned for all subsequent levels. Cc: Juri Lelli Signed-off-by: Jeremy Linton --- arch/arm64/kernel/topology.c | 46 +++++++++++++++++++++++++++++++++++++++++++- 1 file changed, 45 insertions(+), 1 deletion(-) -- 2.13.5 diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 7b06e263fdd1..ce8ec7fd6b32 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,46 @@ 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) +{ + bool is_threaded; + int cpu, 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].package_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].package_id = topology_id; + } + } + + return 0; +} + +#else +static inline int __init parse_acpi_topology(void) +{ + return -EINVAL; +} +#endif void __init init_cpu_topology(void) { @@ -309,6 +351,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(); }