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

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

Pull turbostat changes for 5.19 from Len Brown:

"Chen Yu (1):
      tools/power turbostat: Support thermal throttle count print

Dan Merillat (1):
      tools/power turbostat: fix dump for AMD cpus

Len Brown (5):
      tools/power turbostat: tweak --show and --hide capability
      tools/power turbostat: fix ICX DRAM power numbers
      tools/power turbostat: be more useful as non-root
      tools/power turbostat: No build warnings with -Wextra
      tools/power turbostat: version 2022.04.16

Sumeet Pawnikar (2):
      tools/power turbostat: Add Power Limit4 support
      tools/power turbostat: print power values upto three decimal

Zephaniah E. Loss-Cutler-Hull (2):
      tools/power turbostat: Allow -e for all names.
      tools/power turbostat: Allow printing header every N iterations"

* 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: version 2022.04.16
  tools/power turbostat: No build warnings with -Wextra
  tools/power turbostat: be more useful as non-root
  tools/power turbostat: fix ICX DRAM power numbers
  tools/power turbostat: Support thermal throttle count print
  tools/power turbostat: Allow printing header every N iterations
  tools/power turbostat: Allow -e for all names.
  tools/power turbostat: print power values upto three decimal
  tools/power turbostat: Add Power Limit4 support
  tools/power turbostat: fix dump for AMD cpus
  tools/power turbostat: tweak --show and --hide capability
parents b2d229d4 58990892

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

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


/* Run Time Average Power Limiting (RAPL) Interface */



#define MSR_VR_CURRENT_CONFIG	0x00000601

#define MSR_RAPL_POWER_UNIT		0x00000606



#define MSR_PKG_POWER_LIMIT		0x00000610

tools/power/x86/turbostat/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -9,7 +9,7 @@ ifeq ("$(origin O)", "command line") 
endif



turbostat : turbostat.c

override CFLAGS +=	-O2 -Wall -I../../../include

override CFLAGS +=	-O2 -Wall -Wextra -I../../../include

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

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

override CFLAGS +=	-D_FILE_OFFSET_BITS=64

tools/power/x86/turbostat/turbostat.8

+1 −1
Original line number Diff line number Diff line
@@ -292,7 +292,7 @@ starts a new interval. 
must be run as root.

Alternatively, non-root users can be enabled to run turbostat this way:



# setcap cap_sys_rawio=ep ./turbostat

# setcap cap_sys_admin,cap_sys_rawio,cap_sys_nice=+ep ./turbostat



# chmod +r /dev/cpu/*/msr

tools/power/x86/turbostat/turbostat.c

+386 −208

File changed.

Preview size limit exceeded, changes collapsed.