Received: by 2002:a05:6a10:5bc5:0:0:0:0 with SMTP id os5csp3819166pxb; Sat, 6 Nov 2021 00:56:45 -0700 (PDT) X-Google-Smtp-Source: ABdhPJy93jfpDEUPij8VwwoND1kfOYZzIKLu8dVvlH21pdmaDvoJeINW42Tqd6RrXifwI2MR4X+I X-Received: by 2002:a5d:854a:: with SMTP id b10mr3070492ios.213.1636185404993; Sat, 06 Nov 2021 00:56:44 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1636185404; cv=none; d=google.com; s=arc-20160816; b=shUr+B7KWkYgBzxD5ZYrshoF7HZ4irWPFE5vHFz1fmW0Sb7hdHlnh3ry6eqz7ppwQJ 4wRVJGOwt9o+q01Od0y2dwvVPSjTotiqUyHY9aPc3+Mg4NnIu7aVG32umee2GLBaWdjb QXuLTViHJY6lnzdhXHomP/oyme8xu7KZZI2vqOwTYUM6wq7L2o9fZ6nz39Wr3PJsM28+ WCMX0X+oOWmCm8ktv/miGXHDWtRv8BMTQjlWpucTu0zMXyOlxlkhM9VLW/i3fQx+LRHA 3ghLmZWhtnt+g5OhX/E3gLEN22m5as49n4S5T22FDsKnf9cmurldFzIDVouQEpswyCTU qBUg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:references:in-reply-to:message-id:date:subject :cc:to:from; bh=ogn5iuVHKwwPc5dFcyK9MhNKA50cBC9CCxp63QKPJks=; b=vOdEKE3VgzpuLCCxBYlLPD9iLS25YP/x/wCT1C9UJFW3jZTfmu5YhWT8fXAbJ8ku8s YEi5cWZ64X9oVfkxVqdOS4SouF48AsoehIirgqXi0re2c/ozSKD00ip7UnRKAVF20vYA mPkkmBb3qUlKyVNs7arm64AIj5IidbSUaCAzLnriHV47xoesdM/ZFL5aeryWATWbANFX UaNv3eOjvaSdmpL0GN43nasN5bmSYAqzJs1r1yuIQuoM5HwXBUWTBC6lV318dt9W+28G QNwy4+VWiDFXZwX0Y7A0b8KQ9rZBL+Dffq7YaUODA7xnukJcrH4wxavpFPnJl/0aNWYY buOA== ARC-Authentication-Results: i=1; mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id j15si13752182ilk.22.2021.11.06.00.56.31; Sat, 06 Nov 2021 00:56:44 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=fail (p=NONE sp=NONE dis=NONE) header.from=intel.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S233719AbhKFBhC (ORCPT + 99 others); Fri, 5 Nov 2021 21:37:02 -0400 Received: from mga04.intel.com ([192.55.52.120]:44844 "EHLO mga04.intel.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233384AbhKFBgo (ORCPT ); Fri, 5 Nov 2021 21:36:44 -0400 X-IronPort-AV: E=McAfee;i="6200,9189,10159"; a="230732035" X-IronPort-AV: E=Sophos;i="5.87,212,1631602800"; d="scan'208";a="230732035" Received: from orsmga008.jf.intel.com ([10.7.209.65]) by fmsmga104.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 05 Nov 2021 18:34:02 -0700 X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="5.87,212,1631602800"; d="scan'208";a="502194839" Received: from ranerica-svr.sc.intel.com ([172.25.110.23]) by orsmga008.jf.intel.com with ESMTP; 05 Nov 2021 18:34:01 -0700 From: Ricardo Neri To: "Rafael J. Wysocki" , Daniel Lezcano , linux-pm@vger.kernel.org Cc: x86@kernel.org, linux-doc@vger.kernel.org, Len Brown , Srinivas Pandruvada , Aubrey Li , Amit Kucheria , Andi Kleen , Tim Chen , "Ravi V. Shankar" , Ricardo Neri , linux-kernel@vger.kernel.org, Ricardo Neri Subject: [PATCH 3/7] thermal: intel: hfi: Minimally initialize the Hardware Feedback Interface Date: Fri, 5 Nov 2021 18:33:08 -0700 Message-Id: <20211106013312.26698-4-ricardo.neri-calderon@linux.intel.com> X-Mailer: git-send-email 2.17.1 In-Reply-To: <20211106013312.26698-1-ricardo.neri-calderon@linux.intel.com> References: <20211106013312.26698-1-ricardo.neri-calderon@linux.intel.com> Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The Intel Hardware Feedback Interface provides guidance to the operating system about the performance and energy efficiency capabilities of each CPU in the system. Capabilities are numbers between 0 and 255 where a higher number represents a higher capability. For each CPU, energy efficiency and performance are reported as separate capabilities. Hardware computes these capabilities based on the operating conditions of the system such as power and thermal limits. These capabilities are shared with the operating system in a table resident in memory. Each package in the system has its own HFI instance. Every logical CPU in the package is represented in the table. More than one logical CPUs may be represented in a single table entry. When the hardware updates the table, it generates a package-level thermal interrupt. The size and format of the HFI table depend on the supported features and can only be determined at runtime. To minimally initialize the HFI, parse its features and allocate one instance per package of a data structure with the necessary parameters to read and navigate individual HFI tables. A subsequent changeset will provide per-CPU initialization and interrupt handling. Cc: Andi Kleen Cc: Aubrey Li Cc: Srinivas Pandruvada Cc: Tim Chen Cc: "Ravi V. Shankar" Reviewed-by: Len Brown Co-developed by: Aubrey Li Signed-off-by: Aubrey Li Signed-off-by: Ricardo Neri --- drivers/thermal/intel/Kconfig | 12 +++ drivers/thermal/intel/Makefile | 1 + drivers/thermal/intel/intel_hfi.c | 155 ++++++++++++++++++++++++++++ drivers/thermal/intel/intel_hfi.h | 34 ++++++ drivers/thermal/intel/therm_throt.c | 3 + 5 files changed, 205 insertions(+) create mode 100644 drivers/thermal/intel/intel_hfi.c create mode 100644 drivers/thermal/intel/intel_hfi.h diff --git a/drivers/thermal/intel/Kconfig b/drivers/thermal/intel/Kconfig index c83ea5d04a1d..d4c6bdcacddb 100644 --- a/drivers/thermal/intel/Kconfig +++ b/drivers/thermal/intel/Kconfig @@ -99,3 +99,15 @@ config INTEL_MENLOW Intel Menlow platform. If unsure, say N. + +config INTEL_HFI + bool "Intel Hardware Feedback Interface" + depends on CPU_SUP_INTEL + depends on SCHED_MC && X86_THERMAL_VECTOR + help + Select this option to enable the Hardware Feedback Interface. If + selected, hardware provides guidance to the operating system on + the performance and energy efficiency capabilities of each CPU. + These capabilities may change as a result of changes in the operating + conditions of the system such power and thermal limits. If selected, + the kernel relays updates in CPUs' capabilities to userspace. diff --git a/drivers/thermal/intel/Makefile b/drivers/thermal/intel/Makefile index 960b56268b4a..1a80bffcd699 100644 --- a/drivers/thermal/intel/Makefile +++ b/drivers/thermal/intel/Makefile @@ -13,3 +13,4 @@ obj-$(CONFIG_INTEL_PCH_THERMAL) += intel_pch_thermal.o obj-$(CONFIG_INTEL_TCC_COOLING) += intel_tcc_cooling.o obj-$(CONFIG_X86_THERMAL_VECTOR) += therm_throt.o obj-$(CONFIG_INTEL_MENLOW) += intel_menlow.o +obj-$(CONFIG_INTEL_HFI) += intel_hfi.o diff --git a/drivers/thermal/intel/intel_hfi.c b/drivers/thermal/intel/intel_hfi.c new file mode 100644 index 000000000000..edfe343507b3 --- /dev/null +++ b/drivers/thermal/intel/intel_hfi.c @@ -0,0 +1,155 @@ +// SPDX-License-Identifier: GPL-2.0-only +/* + * Hardware Feedback Interface Driver + * + * Copyright (c) 2021, Intel Corporation. + * + * Authors: Aubrey Li + * Ricardo Neri + * + * + * The Hardware Feedback Interface provides a performance and energy efficiency + * capability information for each CPU in the system. Depending on the processor + * model, hardware may periodically update these capabilities as a result of + * changes in the operating conditions (e.g., power limits or thermal + * constraints). On other processor models, there is a single HFI update + * at boot. + * + * This file provides functionality to process HFI updates and relay these + * updates to userspace. + */ + +#define pr_fmt(fmt) "intel-hfi: " fmt + +#include + +#include "intel_hfi.h" + +/** + * struct hfi_cpu_data - HFI capabilities per CPU + * @perf_cap: Performance capability + * @ee_cap: Energy efficiency capability + * + * Capabilities of a logical processor in the HFI table. These capabilities are + * unitless. + */ +struct hfi_cpu_data { + u8 perf_cap; + u8 ee_cap; +} __packed; + +/** + * struct hfi_hdr - Header of the HFI table + * @perf_updated: Hardware updated performance capabilities + * @ee_updated: Hardware updated energy efficiency capabilities + * + * Properties of the data in an HFI table. + */ +struct hfi_hdr { + u8 perf_updated; + u8 ee_updated; +} __packed; + +/** + * struct hfi_instance - Representation of an HFI instance (i.e., a table) + * @ts_counter: Time stamp of the last update of the table + * @hdr: Base address of the table header + * @data: Base address of the table data + * + * A set of parameters to parse and navigate a specific HFI table. + */ +struct hfi_instance { + u64 *ts_counter; + void *hdr; + void *data; +}; + +/** + * struct hfi_features - Supported HFI features + * @capabilities: Bitmask of supported capabilities + * @nr_table_pages: Size of the HFI table in 4KB pages + * @cpu_stride: Stride size to locate capability data of a logical + * processor within the table (i.e., row stride) + * @hdr_size: Size of table header + * @parsed: True if HFI features have been parsed + * + * Parameters and supported features that are common to all HFI instances + */ +struct hfi_features { + unsigned long capabilities; + unsigned int nr_table_pages; + unsigned int cpu_stride; + unsigned int hdr_size; + bool parsed; +}; + +static int max_hfi_instances; +static struct hfi_instance *hfi_instances; + +static struct hfi_features hfi_features; + +static __init int hfi_parse_features(void) +{ + unsigned int nr_capabilities, reg; + + if (!boot_cpu_has(X86_FEATURE_INTEL_HFI)) + return -ENODEV; + + if (hfi_features.parsed) + return 0; + + /* + * If we are here we know that CPUID_HFI_LEAF exists. Parse the + * supported capabilities and the size of the HFI table. + */ + reg = cpuid_edx(CPUID_HFI_LEAF); + + hfi_features.capabilities = reg & HFI_CAPABILITIES_MASK; + if (!(hfi_features.capabilities & HFI_CAPABILITIES_PERFORMANCE)) { + pr_err("Performance reporting not supported! Not using HFI\n"); + return -ENODEV; + } + + /* The number of 4KB pages required by the table */ + hfi_features.nr_table_pages = ((reg & CPUID_HFI_TABLE_SIZE_MASK) >> + CPUID_HFI_TABLE_SIZE_SHIFT) + 1; + + /* + * The number of supported capabilities determines the number of + * columns in the HFI table. + */ + nr_capabilities = bitmap_weight(&hfi_features.capabilities, + HFI_CAPABILITIES_NR); + + /* + * The header contains change indications for each supported feature. + * The size of the table header is rounded up to be a multiple of 8 + * bytes. + */ + hfi_features.hdr_size = DIV_ROUND_UP(nr_capabilities, 8) * 8; + + /* + * Data of each logical processor is also rounded up to be a multiple + * of 8 bytes. + */ + hfi_features.cpu_stride = DIV_ROUND_UP(nr_capabilities, 8) * 8; + + hfi_features.parsed = true; + return 0; +} + +void __init intel_hfi_init(void) +{ + if (hfi_parse_features()) + return; + + max_hfi_instances = topology_max_packages() * + topology_max_die_per_package(); + + /* + * This allocation may fail. CPU hotplug callbacks must check + * for a null pointer. + */ + hfi_instances = kcalloc(max_hfi_instances, sizeof(*hfi_instances), + GFP_KERNEL); +} diff --git a/drivers/thermal/intel/intel_hfi.h b/drivers/thermal/intel/intel_hfi.h new file mode 100644 index 000000000000..42529d3ac92d --- /dev/null +++ b/drivers/thermal/intel/intel_hfi.h @@ -0,0 +1,34 @@ +/* SPDX-License-Identifier: GPL-2.0 */ +#ifndef _INTEL_HFI_H +#define _INTEL_HFI_H + +#include + +/* Hardware Feedback Interface Enumeration */ +#define CPUID_HFI_LEAF 6 +#define CPUID_HFI_CAP_MASK 0xff +#define CPUID_HFI_TABLE_SIZE_MASK 0x0f00 +#define CPUID_HFI_TABLE_SIZE_SHIFT 8 +#define CPUID_HFI_CPU_INDEX_MASK 0xffff0000 +#define CPUID_HFI_CPU_INDEX_SHIFT 16 + +/* Hardware Feedback Interface Pointer */ +#define HFI_PTR_VALID_BIT BIT(0) +#define HFI_PTR_ADDR_SHIFT 12 + +/* Hardware Feedback Interface Configuration */ +#define HFI_CONFIG_ENABLE_BIT BIT(0) + +/* Hardware Feedback Interface Capabilities */ +#define HFI_CAPABILITIES_MASK 0xff +#define HFI_CAPABILITIES_NR 8 +#define HFI_CAPABILITIES_PERFORMANCE BIT(0) +#define HFI_CAPABILITIES_ENERGY_EFF BIT(1) + +#if defined(CONFIG_INTEL_HFI) +void __init intel_hfi_init(void); +#else +static inline void intel_hfi_init(void) { } +#endif + +#endif /* _INTEL_HFI_H */ diff --git a/drivers/thermal/intel/therm_throt.c b/drivers/thermal/intel/therm_throt.c index dab7e8fb1059..ac408714d52b 100644 --- a/drivers/thermal/intel/therm_throt.c +++ b/drivers/thermal/intel/therm_throt.c @@ -32,6 +32,7 @@ #include #include +#include "intel_hfi.h" #include "thermal_interrupt.h" /* How long to wait between reporting thermal events */ @@ -509,6 +510,8 @@ static __init int thermal_throttle_init_device(void) if (!atomic_read(&therm_throt_en)) return 0; + intel_hfi_init(); + ret = cpuhp_setup_state(CPUHP_AP_ONLINE_DYN, "x86/therm:online", thermal_throttle_online, thermal_throttle_offline); -- 2.17.1