From patchwork Fri Jun 28 18:14:57 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Jeremy Linton X-Patchwork-Id: 168119 Delivered-To: patch@linaro.org Received: by 2002:a92:4782:0:0:0:0:0 with SMTP id e2csp4011212ilk; Fri, 28 Jun 2019 11:15:07 -0700 (PDT) X-Google-Smtp-Source: APXvYqxox6GuPqw1CvGLSJT3gfbnHTx/JIaiSMfg+f6WK95l/jUEEy9PjXTTr3xz91JEtrJdto4S X-Received: by 2002:a17:90a:9b08:: with SMTP id f8mr14906373pjp.103.1561745707587; Fri, 28 Jun 2019 11:15:07 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1561745707; cv=none; d=google.com; s=arc-20160816; b=KQEIRBGutddnbo9Z/nFjnMkqn731Fs1urDm6yhyceEL0SltEkXFKGBicLnWFV0f3rk pqHGH4i3JHcdQ+TAOPk5Jwqfn0Jd0rDhR3fQjDjztdLp+nRz/x1DpAVubGmWV1sS93Wd P/FXVkiBTnxRwFOnKMZV+hSkXQAEY4g2du++Hb3DffT+YpvI5EtF1hyC+aCrABvLBoKQ D+7JuBw91x9EhAKeSzMY78qU3NXr90UqtJqHD04Bd7dsv2VJBX9UB4ynB/MsXsp2jbPN Nr34pLaBmOpwg4JYF655dJ2vrTlvpfRxIlUNM4YClynUeJVZVsMReCFBO+wbnjScc6lx O48g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from; bh=o7YcmtidsCQoep7qv5xOU12ScfxzO8HXPxAmyprhlXw=; b=guo1chlOfaLIAYC8qjZjFJj+Ljn4tJT4UKn53G3XAZaZR66pH4283siZ9F+JuqTY+a oq/wAu27HLAwaLuyT6MMIhTnfnfd5QHxtIfCxL+1Xq3NBzRKib1dlemmrSXCllmLz8E0 kOT5AFPRsenObEWjXce5/XoLcQwRLf7HCbnM5vwLJYew2LOrGsAza/xpxgjj6+OrJ5P2 +tSWyaC9vLfW2yRAdeJUn2lyb6v3fjxhKYbC4hHNDoSOpcAZV5ihGP/5cScWhJCOfXg7 y9SQTTZmfQIyomznOKVM+2w3sFkKhR0uOLB6srDsgFYlTj9xPWplj5slpPvbPxPCauY5 5Wjg== 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 6si3190201pfd.2.2019.06.28.11.15.07; Fri, 28 Jun 2019 11:15:07 -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 S1726408AbfF1SPH (ORCPT + 8 others); Fri, 28 Jun 2019 14:15:07 -0400 Received: from foss.arm.com ([217.140.110.172]:53272 "EHLO foss.arm.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726056AbfF1SPG (ORCPT ); Fri, 28 Jun 2019 14:15:06 -0400 Received: from usa-sjc-imap-foss1.foss.arm.com (unknown [10.121.207.14]) by usa-sjc-mx-foss1.foss.arm.com (Postfix) with ESMTP id 694ACEBD; Fri, 28 Jun 2019 11:15:06 -0700 (PDT) Received: from mammon-tx2.austin.arm.com (mammon-tx2.austin.arm.com [10.118.30.49]) by usa-sjc-imap-foss1.foss.arm.com (Postfix) with ESMTPA id 593263F718; Fri, 28 Jun 2019 11:15:06 -0700 (PDT) From: Jeremy Linton To: linux-arm-kernel@lists.infradead.org Cc: linux-acpi@vger.kernel.org, catalin.marinas@arm.com, will.deacon@arm.com, rjw@rjwysocki.net, lenb@kernel.org, lorenzo.pieralisi@arm.com, sudeep.holla@arm.com, Jeremy Linton Subject: [PATCH v3 2/2] arm64: topology: Use PPTT to determine if PE is a thread Date: Fri, 28 Jun 2019 13:14:57 -0500 Message-Id: <20190628181457.6609-3-jeremy.linton@arm.com> X-Mailer: git-send-email 2.21.0 In-Reply-To: <20190628181457.6609-1-jeremy.linton@arm.com> References: <20190628181457.6609-1-jeremy.linton@arm.com> MIME-Version: 1.0 Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org ACPI 6.3 adds a thread flag to represent if a CPU/PE is actually a thread. Given that the MPIDR_MT bit may not represent this information consistently on homogeneous machines we should prefer the PPTT flag if its available. Signed-off-by: Jeremy Linton --- arch/arm64/kernel/topology.c | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) -- 2.21.0 diff --git a/arch/arm64/kernel/topology.c b/arch/arm64/kernel/topology.c index 0825c4a856e3..cbbedb53cf06 100644 --- a/arch/arm64/kernel/topology.c +++ b/arch/arm64/kernel/topology.c @@ -346,11 +346,9 @@ void remove_cpu_topology(unsigned int cpu) */ static int __init parse_acpi_topology(void) { - bool is_threaded; + int is_threaded; int cpu, topology_id; - is_threaded = read_cpuid_mpidr() & MPIDR_MT_BITMASK; - for_each_possible_cpu(cpu) { int i, cache_id; @@ -358,6 +356,10 @@ static int __init parse_acpi_topology(void) if (topology_id < 0) return topology_id; + is_threaded = acpi_pptt_cpu_is_thread(cpu); + if (is_threaded < 0) + is_threaded = read_cpuid_mpidr() & MPIDR_MT_BITMASK; + if (is_threaded) { cpu_topology[cpu].thread_id = topology_id; topology_id = find_acpi_cpu_topology(cpu, 1);