Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7bc95d4e authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge branch 'pm-cpufreq' 

* pm-cpufreq: (46 commits)
  intel_pstate: provide option to only use intel_pstate with HWP
  cpufreq-dt: Drop unnecessary check before cpufreq_cooling_unregister() invocation
  cpufreq: Create for_each_governor()
  cpufreq: Create for_each_policy()
  cpufreq: Drop cpufreq_disabled() check from cpufreq_cpu_{get|put}()
  cpufreq: Set cpufreq_cpu_data to NULL before putting kobject
  intel_pstate: honor user space min_perf_pct override on resume
  intel_pstate: respect cpufreq policy request
  intel_pstate: Add num_pstates to sysfs
  intel_pstate: expose turbo range to sysfs
  intel_pstate: Add support for SkyLake
  cpufreq: stats: drop unnecessary locking
  cpufreq: stats: don't update stats on false notifiers
  cpufreq: stats: don't update stats from show_trans_table()
  cpufreq: stats: time_in_state can't be NULL in cpufreq_stats_update()
  cpufreq: stats: create sysfs group once we are ready
  cpufreq: remove CPUFREQ_UPDATE_POLICY_CPU notifications
  cpufreq: stats: drop 'cpu' field of struct cpufreq_stats
  cpufreq: Remove (now) unused 'last_cpu' from struct cpufreq_policy
  cpufreq: stats: rename 'struct cpufreq_stats' objects as 'stats'
  ...
parents f5238689 c488ea46

Documentation/cpu-freq/intel-pstate.txt

+8 −0
Original line number Diff line number Diff line
@@ -37,6 +37,14 @@ controlling P state selection. These files have been added to 
      no_turbo: limits the driver to selecting P states below the turbo

      frequency range.



      turbo_pct: displays the percentage of the total performance that

      is supported by hardware that is in the turbo range.  This number

      is independent of whether turbo has been disabled or not.



      num_pstates: displays the number of pstates that are supported

      by hardware.  This number is independent of whether turbo has

      been disabled or not.



For contemporary Intel processors, the frequency is controlled by the

processor itself and the P-states exposed to software are related to

performance levels.  The idea that frequency can be set to a single

Documentation/kernel-parameters.txt

+3 −0
Original line number Diff line number Diff line
@@ -1470,6 +1470,9 @@ bytes respectively. Such letter suffixes can also be entirely omitted. 
		       no_hwp

		         Do not enable hardware P state control (HWP)

			 if available.

		hwp_only

			Only load intel_pstate on systems which support

			hardware P state control (HWP) if available.



	intremap=	[X86-64, Intel-IOMMU]

			on	enable Interrupt Remapping (default)

arch/x86/include/uapi/asm/msr-index.h

+1 −0
Original line number Diff line number Diff line
@@ -358,6 +358,7 @@ 


#define MSR_IA32_PERF_STATUS		0x00000198

#define MSR_IA32_PERF_CTL		0x00000199

#define INTEL_PERF_CTL_MASK		0xffff

#define MSR_AMD_PSTATE_DEF_BASE		0xc0010064

#define MSR_AMD_PERF_STATUS		0xc0010063

#define MSR_AMD_PERF_CTL		0xc0010062

drivers/cpufreq/Kconfig.x86

+10 −0
Original line number Diff line number Diff line
@@ -57,6 +57,16 @@ config X86_ACPI_CPUFREQ_CPB 
	  By enabling this option the acpi_cpufreq driver provides the old

	  entry in addition to the new boost ones, for compatibility reasons.



config X86_SFI_CPUFREQ

	tristate "SFI Performance-States driver"

	depends on X86_INTEL_MID && SFI

	help

	  This adds a CPUFreq driver for some Silvermont based Intel Atom

	  architectures like Z34xx and Z35xx which enumerate processor

	  performance states through SFI.



	  If in doubt, say N.



config ELAN_CPUFREQ

	tristate "AMD Elan SC400 and SC410"

	depends on MELAN

drivers/cpufreq/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ obj-$(CONFIG_X86_P4_CLOCKMOD) += p4-clockmod.o 
obj-$(CONFIG_X86_CPUFREQ_NFORCE2)	+= cpufreq-nforce2.o

obj-$(CONFIG_X86_INTEL_PSTATE)		+= intel_pstate.o

obj-$(CONFIG_X86_AMD_FREQ_SENSITIVITY)	+= amd_freq_sensitivity.o

obj-$(CONFIG_X86_SFI_CPUFREQ)		+= sfi-cpufreq.o



##################################################################################

# ARM SoC drivers