From patchwork Mon Jun 24 16:11:08 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Pandruvada X-Patchwork-Id: 13709781 X-Patchwork-Delegate: rjw@sisk.pl Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id E59DE19D896; Mon, 24 Jun 2024 16:11:23 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719245485; cv=none; b=fABl7bJJJ7Vj20IcwylEw0l188LQaUvbzWHNMjY83BrRng2GrtqyUz3r0Kf7nZ8mEEGXzXgu5HZUxPD6+gxzUg3dsXjHD1IT2K4yltGL/tO7FNy1Dzg3ETOf5k5SgDbV37Kte1Z/4nl11l3Y+LCl+LwYUwCWOGbm5xIOR4us2oA= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719245485; c=relaxed/simple; bh=cXRsgCVXUUj3FzRs1EdGSN3ic6K6LQL4rj8URPH90gk=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=rSYHyKx5MQM2ObjD7l04pAVSeX3FMBDbs+2V9AZejpuDuXy7rN4CYNBun9uUobu2ryKR5cMRyehsJOuUXlU2huuzpYj1ZTznJjpeTyRCXahXbubYHWToID8yoO9Jr9YhyJ4hllv7EtIbVtedzFOVK0M/kx+v+6iCrIlRJkNpvkE= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=l6Uc2Q6/; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="l6Uc2Q6/" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719245484; x=1750781484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=cXRsgCVXUUj3FzRs1EdGSN3ic6K6LQL4rj8URPH90gk=; b=l6Uc2Q6/761QuP69Jx9C6HuzWtGC6TsQcc0m4ANnfcUpUoYWdXx5Ln9t R6UorVtMMtU16nUe9spzeoy0gX78DKIa4gYCso9ddTWKT7Mz08t357wAk ASdEg18CBs5vgVc9/7t/fPRWXEcmkCbHqDYVAKO2t6ZomQYIwdoYt+0I4 tzGUWMXlnLTTzzpc+Y/AJn0QpLhXsTs1Vu01YOmUAMQWIRU57eMKEhYLU RyuO9gcIUUViaQlDACD/cZ6xfoQ0ABPicuwiq4YsTYD7H7j/2ZCVRH99T cLK/0JwrVhHIRyZF0blV0YaxYF+pRkd4UK1VUsfBJOzl0n0BsqiP4thDY A==; X-CSE-ConnectionGUID: g0tCbCO2TxCEh4ugp6rKAw== X-CSE-MsgGUID: Hbgxz8RVTqOf86hQW2lwvw== X-IronPort-AV: E=McAfee;i="6700,10204,11113"; a="12218608" X-IronPort-AV: E=Sophos;i="6.08,262,1712646000"; d="scan'208";a="12218608" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2024 09:11:12 -0700 X-CSE-ConnectionGUID: 6vYcOs9jSw+6HK2cw48drg== X-CSE-MsgGUID: CRCBQnPZTD6zeEcETIe4+Q== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,262,1712646000"; d="scan'208";a="44012674" Received: from spandruv-desk.jf.intel.com ([10.54.75.19]) by orviesa007.jf.intel.com with ESMTP; 24 Jun 2024 09:11:13 -0700 From: Srinivas Pandruvada To: rafael@kernel.org, viresh.kumar@linaro.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, Srinivas Pandruvada Subject: [PATCH v2 1/2] x86/cpufeatures: Add HWP highest perf change feature flag Date: Mon, 24 Jun 2024 09:11:08 -0700 Message-ID: <20240624161109.1427640-2-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240624161109.1427640-1-srinivas.pandruvada@linux.intel.com> References: <20240624161109.1427640-1-srinivas.pandruvada@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 When CPUID[6].EAX[15] is set to 1, this CPU supports notification for HWP (Hardware P-states) highest performance change. Add a feature flag to check if the CPU supports HWP highest performance change. Signed-off-by: Srinivas Pandruvada --- v2: - Prevent display in /proc/cpuinfo flags as suggested by Borris arch/x86/include/asm/cpufeatures.h | 1 + 1 file changed, 1 insertion(+) diff --git a/arch/x86/include/asm/cpufeatures.h b/arch/x86/include/asm/cpufeatures.h index 3c7434329661..4cf929c457bb 100644 --- a/arch/x86/include/asm/cpufeatures.h +++ b/arch/x86/include/asm/cpufeatures.h @@ -361,6 +361,7 @@ #define X86_FEATURE_HWP_ACT_WINDOW (14*32+ 9) /* HWP Activity Window */ #define X86_FEATURE_HWP_EPP (14*32+10) /* HWP Energy Perf. Preference */ #define X86_FEATURE_HWP_PKG_REQ (14*32+11) /* HWP Package Level Request */ +#define X86_FEATURE_HWP_HIGHEST_PERF_CHANGE (14*32+15) /* "" HWP Highest perf change */ #define X86_FEATURE_HFI (14*32+19) /* Hardware Feedback Interface */ /* AMD SVM Feature Identification, CPUID level 0x8000000a (EDX), word 15 */ From patchwork Mon Jun 24 16:11:09 2024 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Srinivas Pandruvada X-Patchwork-Id: 13709782 X-Patchwork-Delegate: rjw@sisk.pl Received: from mgamail.intel.com (mgamail.intel.com [192.198.163.16]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id 76B9919D8AD; Mon, 24 Jun 2024 16:11:24 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; arc=none smtp.client-ip=192.198.163.16 ARC-Seal: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719245485; cv=none; b=FboE5vYTOsl8d7Ra2Y8McQvBWsLNBbkfkcL6SQ3zhe3/WT0PvQ2GcS+OeRrwVMWi2w9FLciy5ZuQL6VOOydABF1Ab6+3RHgiW6R30w5mYed7mEdmcFbn2TmZcosxBYaex7KfWEVTRNWd5Hx628ANqdiHBdXTcn/HF9xcs82Wm68= ARC-Message-Signature: i=1; a=rsa-sha256; d=subspace.kernel.org; s=arc-20240116; t=1719245485; c=relaxed/simple; bh=vRl+X9yYWRM1aDJKdoXKKmE8TKr/CD1+xVJPTQJOtLo=; h=From:To:Cc:Subject:Date:Message-ID:In-Reply-To:References: MIME-Version; b=VsKi3Q2aWX1JUAl+QQ7b4UAJFHAkJSNgvno/CZ5JUiFTL2+VCoEP564+YoWJ1M0HXdECgiitEHrX9DC7TDFqt+NZsfhBUol04V92nGNI53+Yki2mgiAU4rU9i1sXek63xIhvfsZ/BCGIqEDEGo4jX9NDtuvIm/iVgQqQMpUWH+U= ARC-Authentication-Results: i=1; smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com; spf=none smtp.mailfrom=linux.intel.com; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b=RnKtI2gH; arc=none smtp.client-ip=192.198.163.16 Authentication-Results: smtp.subspace.kernel.org; dmarc=pass (p=none dis=none) header.from=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; spf=none smtp.mailfrom=linux.intel.com Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=intel.com header.i=@intel.com header.b="RnKtI2gH" DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=intel.com; i=@intel.com; q=dns/txt; s=Intel; t=1719245484; x=1750781484; h=from:to:cc:subject:date:message-id:in-reply-to: references:mime-version:content-transfer-encoding; bh=vRl+X9yYWRM1aDJKdoXKKmE8TKr/CD1+xVJPTQJOtLo=; b=RnKtI2gHB51kMNLknpF7T9v9Tdh10T/XC3WyQtSymuexeLcM6tnzmEp5 L7gN8eXBrrPGK6IGkoownaizcXpdh6P9IJP5qH9Z1yzdibBmSnEYk/JE9 Fw4VX/FkfppLBKcnZcVxRTjUK3h7B0fBmJaAOHtrlwikoLn5mS/OKyaGL FTUw78WTiMZVNgaaSHR4wDwCyBKiEDtk+vFPIcuJC/H75ujl02WMAPjDp OC5zNqAGRj66YASuB5EnxxaK0/WE7Mzw1E462yqyeQR8+yWoMIf1ynXX9 z2tP84CcgmyAAGGpQlYAuxvJyEbq+kM8/Zh0ps7hMgr5+xbb3SWjR9ON1 w==; X-CSE-ConnectionGUID: t/rCqDxuRyOARrCnvJIg9Q== X-CSE-MsgGUID: rl42a6JPSjWWLLdr9rZu6g== X-IronPort-AV: E=McAfee;i="6700,10204,11113"; a="12218615" X-IronPort-AV: E=Sophos;i="6.08,262,1712646000"; d="scan'208";a="12218615" Received: from orviesa007.jf.intel.com ([10.64.159.147]) by fmvoesa110.fm.intel.com with ESMTP/TLS/ECDHE-RSA-AES256-GCM-SHA384; 24 Jun 2024 09:11:12 -0700 X-CSE-ConnectionGUID: 6OiU0xDVQaqvFmzmLyq/ww== X-CSE-MsgGUID: 6F4wmaYAT2msWhYizh3EKQ== X-ExtLoop1: 1 X-IronPort-AV: E=Sophos;i="6.08,262,1712646000"; d="scan'208";a="44012675" Received: from spandruv-desk.jf.intel.com ([10.54.75.19]) by orviesa007.jf.intel.com with ESMTP; 24 Jun 2024 09:11:13 -0700 From: Srinivas Pandruvada To: rafael@kernel.org, viresh.kumar@linaro.org, tglx@linutronix.de, mingo@redhat.com, bp@alien8.de, dave.hansen@linux.intel.com, hpa@zytor.com Cc: linux-pm@vger.kernel.org, linux-kernel@vger.kernel.org, x86@kernel.org, Srinivas Pandruvada Subject: [PATCH v2 2/2] cpufreq: intel_pstate: Support highest performance change interrupt Date: Mon, 24 Jun 2024 09:11:09 -0700 Message-ID: <20240624161109.1427640-3-srinivas.pandruvada@linux.intel.com> X-Mailer: git-send-email 2.44.0 In-Reply-To: <20240624161109.1427640-1-srinivas.pandruvada@linux.intel.com> References: <20240624161109.1427640-1-srinivas.pandruvada@linux.intel.com> Precedence: bulk X-Mailing-List: linux-pm@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 On some systems, the HWP (Hardware P-states) highest performance level can change from the value set at boot-up. This behavior can lead to two issues: - The 'cpuinfo_max_freq' within the 'cpufreq' sysfs will not reflect the CPU's highest achievable performance. - Even if the CPU's highest performance level is increased after booting, the CPU may not reach the full expected performance. The availability of this feature is indicated by the CPUID instruction: if CPUID[6].EAX[15] is set to 1, the feature is supported. When supported, setting bit 2 of the MSR_HWP_INTERRUPT register enables notifications of the highest performance level changes. Therefore, as part of enabling the HWP interrupt, bit 2 of the MSR_HWP_INTERRUPT should also be set when this feature is supported. Upon a change in the highest performance level, a new HWP interrupt is generated, with bit 3 of the MSR_HWP_STATUS register set, and the MSR_HWP_CAPABILITIES register is updated with the new highest performance limit. The processing of the interrupt is the same as the guaranteed performance change. Notify change to cpufreq core and update MSR_HWP_REQUEST with new performance limits. The current driver implementation already takes care of the highest performance change as part of: commit dfeeedc1bf57 ("cpufreq: intel_pstate: Update cpuinfo.max_freq on HWP_CAP changes") For example: Before highest performance change interrupt: cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq 3700000 cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq 3700000 After highest performance changes interrupt: cat /sys/devices/system/cpu/cpu0/cpufreq/cpuinfo_max_freq 3900000 cat /sys/devices/system/cpu/cpu0/cpufreq/scaling_max_freq 3900000 Signed-off-by: Srinivas Pandruvada --- v2 - Change from boot_cpu_has() to cpu_feature_enabled() as suggested by Borris drivers/cpufreq/intel_pstate.c | 23 +++++++++++++++++++---- 1 file changed, 19 insertions(+), 4 deletions(-) diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c index 15de5e3d96fd..8652555cbaae 100644 --- a/drivers/cpufreq/intel_pstate.c +++ b/drivers/cpufreq/intel_pstate.c @@ -1626,17 +1626,24 @@ static void intel_pstate_notify_work(struct work_struct *work) static DEFINE_SPINLOCK(hwp_notify_lock); static cpumask_t hwp_intr_enable_mask; +#define HWP_GUARANTEED_PERF_CHANGE_STATUS BIT(0) +#define HWP_HIGHEST_PERF_CHANGE_STATUS BIT(3) + void notify_hwp_interrupt(void) { unsigned int this_cpu = smp_processor_id(); + u64 value, status_mask; unsigned long flags; - u64 value; if (!hwp_active || !boot_cpu_has(X86_FEATURE_HWP_NOTIFY)) return; + status_mask = HWP_GUARANTEED_PERF_CHANGE_STATUS; + if (cpu_feature_enabled(X86_FEATURE_HWP_HIGHEST_PERF_CHANGE)) + status_mask |= HWP_HIGHEST_PERF_CHANGE_STATUS; + rdmsrl_safe(MSR_HWP_STATUS, &value); - if (!(value & 0x01)) + if (!(value & status_mask)) return; spin_lock_irqsave(&hwp_notify_lock, flags); @@ -1674,17 +1681,25 @@ static void intel_pstate_disable_hwp_interrupt(struct cpudata *cpudata) cancel_delayed_work_sync(&cpudata->hwp_notify_work); } +#define HWP_GUARANTEED_PERF_CHANGE_REQ BIT(0) +#define HWP_HIGHEST_PERF_CHANGE_REQ BIT(2) + static void intel_pstate_enable_hwp_interrupt(struct cpudata *cpudata) { - /* Enable HWP notification interrupt for guaranteed performance change */ + /* Enable HWP notification interrupt for performance change */ if (boot_cpu_has(X86_FEATURE_HWP_NOTIFY)) { + u64 interrupt_mask = HWP_GUARANTEED_PERF_CHANGE_REQ; + spin_lock_irq(&hwp_notify_lock); INIT_DELAYED_WORK(&cpudata->hwp_notify_work, intel_pstate_notify_work); cpumask_set_cpu(cpudata->cpu, &hwp_intr_enable_mask); spin_unlock_irq(&hwp_notify_lock); + if (cpu_feature_enabled(X86_FEATURE_HWP_HIGHEST_PERF_CHANGE)) + interrupt_mask |= HWP_HIGHEST_PERF_CHANGE_REQ; + /* wrmsrl_on_cpu has to be outside spinlock as this can result in IPC */ - wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, 0x01); + wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_INTERRUPT, interrupt_mask); wrmsrl_on_cpu(cpudata->cpu, MSR_HWP_STATUS, 0); } }