From patchwork Mon Oct 14 09:56:25 2019 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Garry X-Patchwork-Id: 176136 Delivered-To: patch@linaro.org Received: by 2002:a92:7e96:0:0:0:0:0 with SMTP id q22csp4287025ill; Mon, 14 Oct 2019 02:59:54 -0700 (PDT) X-Google-Smtp-Source: APXvYqypcn5e3B3LaJh1tm3xHwNAPFf1/pXaFIYCAjRcxlI8g7caYk99L567dEW/B1CBOePlr6wy X-Received: by 2002:a50:b966:: with SMTP id m93mr27124384ede.228.1571047194035; Mon, 14 Oct 2019 02:59:54 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1571047194; cv=none; d=google.com; s=arc-20160816; b=ZQY2yqPnacsjANpUl2GVwrza6jTXtDD8joPF5RKWB3Z0+ftLx5OcV9L3vY7kfLSPOv OW6e7950SynVkWX9G9aROaQHe0Uuk0MbSP1nF8iv+0pGeKt4BJkEiWbDiUEAmvtiFa3y Ii6OiiH19K17rIEq6a2c71F88b96PQqdK8qMPnP1L+gbXUD1VdYU5e/Yl80mIStcHTqa ou6XdaFzanoEf+O1Uo3jakcHHii968H86k8DBcPn+iwYTZyyV+rwF63Qr5CC0vDcjRFt sbMrZAAPC4/ecJV4P2RmWxqJtF2iWpG/PbeL/vuIFjmdGpIzPyBbEVtFILhbakIqu7OO vBaQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:mime-version:references:in-reply-to :message-id:date:subject:cc:to:from; bh=FtAp2VrFICGd+jCYnNVjeT3BVzwK706gjcU83wBrMF4=; b=KO/ZthL72Uo+X7HbrMkm3gKKMSwhTcrmJVg9qWzDI2l6NorDHCVFsSzfkpU9lvbmsE DG29+Z3r1M2zqBjQe5X0mvewcRsJw8RZIACO6IavE8rjVZPXNz87vmfhF8zLCGdKWMDb Nxze+SU0aDYDBI1M/dl4kUcVFqmr/hVBjAfnL4LY1eDFmKhHEtvT4kjB70RRz2oxBEBQ bfa56Vy6RcUc4nNk1hRfzGwbGGu/R0MWrtAUzKCFH2EPhm7fGGzYux5s2LjjZTMewjKc +E3KVzLFT68CdWMK6R5EiNtCG4iH3ddSpnTaZ1MwZaC7akv/S2pZ9HxPYSdAwcYhlYoy btnw== 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 27si10771830edz.186.2019.10.14.02.59.53; Mon, 14 Oct 2019 02:59:54 -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 S1731180AbfJNJ7x (ORCPT + 7 others); Mon, 14 Oct 2019 05:59:53 -0400 Received: from szxga05-in.huawei.com ([45.249.212.191]:3745 "EHLO huawei.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1731172AbfJNJ7x (ORCPT ); Mon, 14 Oct 2019 05:59:53 -0400 Received: from DGGEMS403-HUB.china.huawei.com (unknown [172.30.72.58]) by Forcepoint Email with ESMTP id E3A768A9AA0A377671D7; Mon, 14 Oct 2019 17:59:50 +0800 (CST) Received: from localhost.localdomain (10.67.212.75) by DGGEMS403-HUB.china.huawei.com (10.3.19.203) with Microsoft SMTP Server id 14.3.439.0; Mon, 14 Oct 2019 17:59:43 +0800 From: John Garry To: CC: , , , , , , , , , , , , , , , , John Garry Subject: [PATCH for-stable-4.19 2/3] ACPI/PPTT: Add support for ACPI 6.3 thread flag Date: Mon, 14 Oct 2019 17:56:25 +0800 Message-ID: <1571046986-231263-3-git-send-email-john.garry@huawei.com> X-Mailer: git-send-email 2.8.1 In-Reply-To: <1571046986-231263-1-git-send-email-john.garry@huawei.com> References: <1571046986-231263-1-git-send-email-john.garry@huawei.com> MIME-Version: 1.0 X-Originating-IP: [10.67.212.75] X-CFilter-Loop: Reflected Sender: linux-acpi-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-acpi@vger.kernel.org From: Jeremy Linton Commit bbd1b70639f785a970d998f35155c713f975e3ac upstream. ACPI 6.3 adds a flag to the CPU node to indicate whether the given PE is a thread. Add a function to return that information for a given linux logical CPU. Signed-off-by: Jeremy Linton Reviewed-by: Sudeep Holla Reviewed-by: Robert Richter Acked-by: Rafael J. Wysocki Signed-off-by: Will Deacon [jpg: backport for 4.19, replace acpi_pptt_warn_missing()] Signed-off-by: John Garry --- drivers/acpi/pptt.c | 52 ++++++++++++++++++++++++++++++++++++++++++++ include/linux/acpi.h | 5 +++++ 2 files changed, 57 insertions(+) -- 2.17.1 diff --git a/drivers/acpi/pptt.c b/drivers/acpi/pptt.c index da031b1df6f5..9dbf86a0c827 100644 --- a/drivers/acpi/pptt.c +++ b/drivers/acpi/pptt.c @@ -509,6 +509,44 @@ static int find_acpi_cpu_topology_tag(unsigned int cpu, int level, int flag) return retval; } +/** + * check_acpi_cpu_flag() - Determine if CPU node has a flag set + * @cpu: Kernel logical CPU number + * @rev: The minimum PPTT revision defining the flag + * @flag: The flag itself + * + * Check the node representing a CPU for a given flag. + * + * Return: -ENOENT if the PPTT doesn't exist, the CPU cannot be found or + * the table revision isn't new enough. + * 1, any passed flag set + * 0, flag unset + */ +static int check_acpi_cpu_flag(unsigned int cpu, int rev, u32 flag) +{ + struct acpi_table_header *table; + acpi_status status; + u32 acpi_cpu_id = get_acpi_id_for_cpu(cpu); + struct acpi_pptt_processor *cpu_node = NULL; + int ret = -ENOENT; + + status = acpi_get_table(ACPI_SIG_PPTT, 0, &table); + if (ACPI_FAILURE(status)) { + pr_warn_once("No PPTT table found, cpu topology may be inaccurate\n"); + return ret; + } + + if (table->revision >= rev) + cpu_node = acpi_find_processor_node(table, acpi_cpu_id); + + if (cpu_node) + ret = (cpu_node->flags & flag) != 0; + + acpi_put_table(table); + + return ret; +} + /** * acpi_find_last_cache_level() - Determines the number of cache levels for a PE * @cpu: Kernel logical cpu number @@ -573,6 +611,20 @@ int cache_setup_acpi(unsigned int cpu) return status; } +/** + * acpi_pptt_cpu_is_thread() - Determine if CPU is a thread + * @cpu: Kernel logical CPU number + * + * Return: 1, a thread + * 0, not a thread + * -ENOENT ,if the PPTT doesn't exist, the CPU cannot be found or + * the table revision isn't new enough. + */ +int acpi_pptt_cpu_is_thread(unsigned int cpu) +{ + return check_acpi_cpu_flag(cpu, 2, ACPI_PPTT_ACPI_PROCESSOR_IS_THREAD); +} + /** * find_acpi_cpu_topology() - Determine a unique topology value for a given cpu * @cpu: Kernel logical cpu number diff --git a/include/linux/acpi.h b/include/linux/acpi.h index b4d23b3a2ef2..59a416dfcaaa 100644 --- a/include/linux/acpi.h +++ b/include/linux/acpi.h @@ -1291,10 +1291,15 @@ static inline int lpit_read_residency_count_address(u64 *address) #endif #ifdef CONFIG_ACPI_PPTT +int acpi_pptt_cpu_is_thread(unsigned int cpu); int find_acpi_cpu_topology(unsigned int cpu, int level); int find_acpi_cpu_topology_package(unsigned int cpu); int find_acpi_cpu_cache_topology(unsigned int cpu, int level); #else +static inline int acpi_pptt_cpu_is_thread(unsigned int cpu) +{ + return -EINVAL; +} static inline int find_acpi_cpu_topology(unsigned int cpu, int level) { return -EINVAL;