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

Commit 10bbe759 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 

Pull turbostat updates from Len Brown.

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: remove obsolete -M, -m, -C, -c options
  tools/power turbostat: Make extensible via the --add parameter
  tools/power turbostat: Denverton uses a 25 MHz crystal, not 19.2 MHz
  tools/power turbostat: line up headers when -M is used
  tools/power turbostat: fix SKX PKG_CSTATE_LIMIT decoding
  tools/power turbostat: Support Knights Mill (KNM)
  tools/power turbostat: Display HWP OOB status
  tools/power turbostat: fix Denverton BCLK
  tools/power turbostat: use intel-family.h model strings
  tools/power/turbostat: Add Denverton RAPL support
  tools/power/turbostat: Add Denverton support
  tools/power/turbostat: split core MSR support into status + limit
  tools/power turbostat: fix error case overflow read of slm_freq_table[]
  tools/power turbostat: Allocate correct amount of fd and irq entries
  tools/power turbostat: switch to tab delimited output
  tools/power turbostat: Gracefully handle ACPI S3
  tools/power turbostat: tidy up output on Joule counter overflow
parents 62906027 6886fee4

tools/power/x86/turbostat/Makefile

+1 −0
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ endif 
turbostat : turbostat.c

CFLAGS +=	-Wall

CFLAGS +=	-DMSRHEADER='"../../../../arch/x86/include/asm/msr-index.h"'

CFLAGS +=	-DINTEL_FAMILY_HEADER='"../../../../arch/x86/include/asm/intel-family.h"'



%: %.c

	@mkdir -p $(BUILD_OUTPUT)

tools/power/x86/turbostat/turbostat.8

+20 −6
Original line number Diff line number Diff line
@@ -25,9 +25,27 @@ Some information is not available on older processors. 
.SS Options

Options can be specified with a single or double '-', and only as much of the option

name as necessary to disambiguate it from others is necessary.  Note that options are case-sensitive.

\fB--Counter MSR#\fP shows the delta of the specified 64-bit MSR counter.

.PP

\fB--counter MSR#\fP shows the delta of the specified 32-bit MSR counter.

\fB--add attributes\fP add column with counter having specified 'attributes'.  The 'location' attribute is required, all others are optional.

.nf

	location: {\fBmsrDDD\fP | \fBmsr0xXXX\fP}

		msrDDD is a decimal offset, eg. msr16

		msr0xXXX is a hex offset, eg. msr0x10



	scope: {\fBcpu\fP | \fBcore\fP | \fBpackage\fP}

		sample and print the counter for every cpu, core, or package.

		default: cpu



	size: {\fBu32\fP | \fBu64\fP }

		MSRs are read as 64-bits, u32 truncates the displayed value to 32-bits.

		default: u64



	format: {\fBraw\fP | \fBdelta\fP | \fBpercent\fP}

		'raw' shows the MSR contents in hex.

		'delta' shows the difference in values during the measurement interval.

		'percent' shows the delta as a percentage of the cycles elapsed.

		default: delta

.fi

.PP

\fB--Dump\fP displays the raw counter values.

.PP
@@ -43,10 +61,6 @@ The file is truncated if it already exists, and it is created if it does not exi 
.PP

\fB--Joules\fP displays energy in Joules, rather than dividing Joules by time to print power in Watts.

.PP

\fB--MSR MSR#\fP shows the specified 64-bit MSR value.

.PP

\fB--msr MSR#\fP shows the specified 32-bit MSR value.

.PP

\fB--Package\fP limits output to the system summary plus the 1st thread in each Package.

.PP

\fB--processor\fP limits output to the system summary plus the 1st thread in each processor of each package.  Ie. it skips hyper-threaded siblings.

tools/power/x86/turbostat/turbostat.c

+652 −365

File changed.

Preview size limit exceeded, changes collapsed.