Commit 64c6a36d authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'pm-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm 

Pull power management fixes from Rafael Wysocki:
 "These fix the intel_pstate and amd-pstate cpufreq drivers and the
  cpupower utility.

  Specifics:

   - Fix a recently introduced unchecked HWP MSR access in the
     intel_pstate driver (Srinivas Pandruvada)

   - Add missing conversion from MHz to KHz to amd_pstate_set_boost() to
     address sysfs inteface inconsistency and fix P-state frequency
     reporting on AMD Family 1Ah CPUs in the cpupower utility (Dhananjay
     Ugwekar)

   - Get rid of an excess global header file used by the amd-pstate
     cpufreq driver (Arnd Bergmann)"

* tag 'pm-6.10-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm:
  cpufreq: intel_pstate: Fix unchecked HWP MSR access
  cpufreq: amd-pstate: Fix the inconsistency in max frequency units
  cpufreq: amd-pstate: remove global header file
  tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs
parents 19ca0d8a 9b7e7ff0

MAINTAINERS

+0 −1
Original line number Diff line number Diff line
@@ -1107,7 +1107,6 @@ L: linux-pm@vger.kernel.org 
S:	Supported

F:	Documentation/admin-guide/pm/amd-pstate.rst

F:	drivers/cpufreq/amd-pstate*

F:	include/linux/amd-pstate.h

F:	tools/power/x86/amd_pstate_tracer/amd_pstate_trace.py









AMD PTDMA DRIVER
































drivers/cpufreq/amd-pstate-ut.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -26,10 +26,11 @@







#include <linux/module.h>









#include <linux/moduleparam.h>









#include <linux/fs.h>









#include <linux/amd-pstate.h>



















#include <acpi/cppc_acpi.h>



















#include "amd-pstate.h"



















/*









 * Abbreviations:









 * amd_pstate_ut: used as a shortform for AMD P-State unit test.
































drivers/cpufreq/amd-pstate.c



+34
−2






























Original line number
Diff line number
Diff line







@@ -36,7 +36,6 @@







#include <linux/delay.h>









#include <linux/uaccess.h>









#include <linux/static_call.h>









#include <linux/amd-pstate.h>









#include <linux/topology.h>



















#include <acpi/processor.h>








@@ -46,6 +45,8 @@







#include <asm/processor.h>









#include <asm/cpufeature.h>









#include <asm/cpu_device_id.h>



















#include "amd-pstate.h"









#include "amd-pstate-trace.h"



















#define AMD_PSTATE_TRANSITION_LATENCY	20000








@@ -53,6 +54,37 @@







#define CPPC_HIGHEST_PERF_PERFORMANCE	196









#define CPPC_HIGHEST_PERF_DEFAULT	166



















#define AMD_CPPC_EPP_PERFORMANCE		0x00









#define AMD_CPPC_EPP_BALANCE_PERFORMANCE	0x80









#define AMD_CPPC_EPP_BALANCE_POWERSAVE		0xBF









#define AMD_CPPC_EPP_POWERSAVE			0xFF



















/*









 * enum amd_pstate_mode - driver working mode of amd pstate









 */









enum amd_pstate_mode {









	AMD_PSTATE_UNDEFINED = 0,









	AMD_PSTATE_DISABLE,









	AMD_PSTATE_PASSIVE,









	AMD_PSTATE_ACTIVE,









	AMD_PSTATE_GUIDED,









	AMD_PSTATE_MAX,









};



















static const char * const amd_pstate_mode_string[] = {









	[AMD_PSTATE_UNDEFINED]   = "undefined",









	[AMD_PSTATE_DISABLE]     = "disable",









	[AMD_PSTATE_PASSIVE]     = "passive",









	[AMD_PSTATE_ACTIVE]      = "active",









	[AMD_PSTATE_GUIDED]      = "guided",









	NULL,









};



















struct quirk_entry {









	u32 nominal_freq;









	u32 lowest_freq;









};



















/*









 * TODO: We need more time to fine tune processors with shared memory solution









 * with community together.








@@ -669,7 +701,7 @@ static int amd_pstate_set_boost(struct cpufreq_policy *policy, int state)







	if (state)









		policy->cpuinfo.max_freq = cpudata->max_freq;









	else









		policy->cpuinfo.max_freq = cpudata->nominal_freq;









		policy->cpuinfo.max_freq = cpudata->nominal_freq * 1000;



















	policy->max = policy->cpuinfo.max_freq;










































include/linux/amd-pstate.h→drivers/cpufreq/amd-pstate.h



+0
−33






























Original line number
Diff line number
Diff line









/* SPDX-License-Identifier: GPL-2.0-only */









/*









 * linux/include/linux/amd-pstate.h









 *









 * Copyright (C) 2022 Advanced Micro Devices, Inc.









 *









 * Author: Meng Li <li.meng@amd.com>








@@ -12,11 +10,6 @@

















#include <linux/pm_qos.h>



















#define AMD_CPPC_EPP_PERFORMANCE		0x00









#define AMD_CPPC_EPP_BALANCE_PERFORMANCE	0x80









#define AMD_CPPC_EPP_BALANCE_POWERSAVE		0xBF









#define AMD_CPPC_EPP_POWERSAVE			0xFF



















/*********************************************************************









 *                        AMD P-state INTERFACE                       *









 *********************************************************************/








@@ -108,30 +101,4 @@ struct amd_cpudata {







	bool	suspended;









};



















/*









 * enum amd_pstate_mode - driver working mode of amd pstate









 */









enum amd_pstate_mode {









	AMD_PSTATE_UNDEFINED = 0,









	AMD_PSTATE_DISABLE,









	AMD_PSTATE_PASSIVE,









	AMD_PSTATE_ACTIVE,









	AMD_PSTATE_GUIDED,









	AMD_PSTATE_MAX,









};



















static const char * const amd_pstate_mode_string[] = {









	[AMD_PSTATE_UNDEFINED]   = "undefined",









	[AMD_PSTATE_DISABLE]     = "disable",









	[AMD_PSTATE_PASSIVE]     = "passive",









	[AMD_PSTATE_ACTIVE]      = "active",









	[AMD_PSTATE_GUIDED]      = "guided",









	NULL,









};



















struct quirk_entry {









	u32 nominal_freq;









	u32 lowest_freq;









};



















#endif /* _LINUX_AMD_PSTATE_H */
























drivers/cpufreq/intel_pstate.c



+2
−1






























Original line number
Diff line number
Diff line







@@ -1153,6 +1153,7 @@ static void intel_pstate_update_policies(void)







static void __intel_pstate_update_max_freq(struct cpudata *cpudata,









					   struct cpufreq_policy *policy)









{









	if (hwp_active)









		intel_pstate_get_hwp_cap(cpudata);



















	policy->cpuinfo.max_freq = READ_ONCE(global.no_turbo) ?