Merge branch 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux (8bff39bf) · Commits · 戴 / test

Pull turbostat updates from Len Brown: "Update update to version 20.09.30, one kernel side fix" * 'turbostat' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux: tools/power turbostat: update version number powercap: restrict energy meter to root access tools/power turbostat: harden against cpu hotplug tools/power turbostat: adjust for temperature offset tools/power turbostat: Build with _FILE_OFFSET_BITS=64 tools/power turbostat: Support AMD Family 19h tools/power turbostat: Remove empty columns for Jacobsville tools/power turbostat: Add a new GFXAMHz column that exposes gt_act_freq_mhz. tools/power x86_energy_perf_policy: Input/output error in a VM tools/power turbostat: Skip pc8, pc9, pc10 columns, if they are disabled tools/power turbostat: Support additional CPU model numbers tools/power turbostat: Fix output formatting for ACPI CST enumeration tools/power turbostat: Replace HTTP links with HTTPS ones: TURBOSTAT UTILITY tools/power turbostat: Use sched_getcpu() instead of hardcoded cpu 0 tools/power turbostat: Enable accumulate RAPL display tools/power turbostat: Introduce functions to accumulate RAPL consumption tools/power turbostat: Make the energy variable to be 64 bit tools/power turbostat: Always print idle in the system configuration header tools/power turbostat: Print /dev/cpu_dma_latency

drivers/powercap/powercap_sys.c

+2 −2

Original line number	Diff line number	Diff line
		@@ -367,9 +367,9 @@ static void create_power_zone_common_attributes(
		&dev_attr_max_energy_range_uj.attr;
		if (power_zone->ops->get_energy_uj) {
		if (power_zone->ops->reset_energy_uj)
		dev_attr_energy_uj.attr.mode = S_IWUSR \| S_IRUGO;
		dev_attr_energy_uj.attr.mode = S_IWUSR \| S_IRUSR;
		else
		dev_attr_energy_uj.attr.mode = S_IRUGO;
		dev_attr_energy_uj.attr.mode = S_IRUSR;
		power_zone->zone_dev_attrs[count++] =
		&dev_attr_energy_uj.attr;
		}

tools/power/x86/turbostat/Makefile

+2 −1

Original line number	Diff line number	Diff line
		@@ -12,11 +12,12 @@ turbostat : turbostat.c
		override CFLAGS += -O2 -Wall -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
		override CFLAGS += -D_FORTIFY_SOURCE=2

		%: %.c
		@mkdir -p $(BUILD_OUTPUT)
		$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS) -lcap
		$(CC) $(CFLAGS) $< -o $(BUILD_OUTPUT)/$@ $(LDFLAGS) -lcap -lrt

		.PHONY : clean
		clean :

tools/power/x86/turbostat/turbostat.8

+1 −1

Original line number	Diff line number	Diff line
		@@ -335,7 +335,7 @@ that they count at TSC rate, which is true on all processors tested to date.

		.SH REFERENCES
		Volume 3B: System Programming Guide"
		http://www.intel.com/products/processor/manuals/
		https://www.intel.com/products/processor/manuals/

		.SH FILES
		.ta

tools/power/x86/turbostat/turbostat.c

+450 −123

File changed.

Preview size limit exceeded, changes collapsed.

tools/power/x86/x86_energy_perf_policy/x86_energy_perf_policy.c

+54 −13

File changed.

Preview size limit exceeded, changes collapsed.

Admin message