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

Merge branch 'pm-tools' 

* pm-tools:
  cpupower: IvyBridge (0x3a and 0x3e models) support
  cpupower: Provide -c param for cpupower monitor to schedule process on all cores
  cpupower tools: Fix warning and a bug with the cpu package count
  cpupower tools: Fix malloc of cpu_info structure
  cpupower tools: Fix issues with sysfs_topology_read_file
  cpupower tools: Fix minor warnings
  cpupower tools: Update .gitignore for files created in the debug directories
  cpupower tools: Remove brace expansion from clean target
parents 170bb4c8 8d219e36

tools/power/cpupower/.gitignore

+7 −0
Original line number Diff line number Diff line
@@ -20,3 +20,10 @@ utils/cpufreq-set.o 
utils/cpufreq-aperf.o

cpupower

bench/cpufreq-bench

debug/kernel/Module.symvers

debug/i386/centrino-decode

debug/i386/dump_psb

debug/i386/intel_gsic

debug/i386/powernow-k8-decode

debug/x86_64/centrino-decode

debug/x86_64/powernow-k8-decode

tools/power/cpupower/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -253,7 +253,8 @@ clean: 
	 | xargs rm -f

	-rm -f $(OUTPUT)cpupower

	-rm -f $(OUTPUT)libcpupower.so*

	-rm -rf $(OUTPUT)po/*.{gmo,pot}

	-rm -rf $(OUTPUT)po/*.gmo

	-rm -rf $(OUTPUT)po/*.pot

	$(MAKE) -C bench O=$(OUTPUT) clean

tools/power/cpupower/debug/i386/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -26,7 +26,10 @@ $(OUTPUT)powernow-k8-decode: powernow-k8-decode.c 
all: $(OUTPUT)centrino-decode $(OUTPUT)dump_psb $(OUTPUT)intel_gsic $(OUTPUT)powernow-k8-decode



clean:

	rm -rf $(OUTPUT){centrino-decode,dump_psb,intel_gsic,powernow-k8-decode}

	rm -rf $(OUTPUT)centrino-decode

	rm -rf $(OUTPUT)dump_psb

	rm -rf $(OUTPUT)intel_gsic

	rm -rf $(OUTPUT)powernow-k8-decode



install:

	$(INSTALL) -d $(DESTDIR)${bindir}

tools/power/cpupower/man/cpupower-monitor.1

+13 −2
Original line number Diff line number Diff line
@@ -7,11 +7,11 @@ cpupower\-monitor \- Report processor frequency and idle statistics 
.RB "\-l"



.B cpupower monitor

.RB [ "\-m <mon1>," [ "<mon2>,..." ] ]

.RB [ -c ] [ "\-m <mon1>," [ "<mon2>,..." ] ]

.RB [ "\-i seconds" ]

.br

.B cpupower monitor

.RB [ "\-m <mon1>," [ "<mon2>,..." ] ]

.RB [ -c ][ "\-m <mon1>," [ "<mon2>,..." ] ]

.RB command

.br

.SH DESCRIPTION
@@ -64,6 +64,17 @@ Only display specific monitors. Use the monitor string(s) provided by \-l option 
Measure intervall.

.RE

.PP

\-c

.RS 4

Schedule the process on every core before starting and ending measuring.

This could be needed for the Idle_Stats monitor when no other MSR based

monitor (has to be run on the core that is measured) is run in parallel.

This is to wake up the processors from deeper sleep states and let the

kernel re

-account its cpuidle (C-state) information before reading the

cpuidle timings from sysfs.

.RE

.PP

command

.RS 4

Measure idle and frequency characteristics of an arbitrary command/workload.

tools/power/cpupower/utils/helpers/cpuid.c

+2 −0
Original line number Diff line number Diff line
@@ -158,6 +158,8 @@ int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info) 
				cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO;

			case 0x2A:	/* SNB */

			case 0x2D:	/* SNB Xeon */

			case 0x3A:	/* IVB */

			case 0x3E:	/* IVB Xeon */

				cpu_info->caps |= CPUPOWER_CAP_HAS_TURBO_RATIO;

				cpu_info->caps |= CPUPOWER_CAP_IS_SNB;

				break;