Commit 234458d0 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'v6.10-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux 

Pull turbostat fixes from Len Brown:
 "Fix three recent minor turbostat regressions"

* tag 'v6.10-rc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux:
  tools/power turbostat: Add local build_bug.h header for snapshot target
  tools/power turbostat: Fix unc freq columns not showing with '-q' or '-l'
  tools/power turbostat: option '-n' is ambiguous
parents 5bbd9b24 b15943c4

tools/power/x86/turbostat/Makefile

+5 −1
Original line number Diff line number Diff line
@@ -14,6 +14,7 @@ turbostat : turbostat.c 
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 +=	-DBUILD_BUG_HEADER='"../../../../include/linux/build_bug.h"'

override CFLAGS +=	-D_FILE_OFFSET_BITS=64

override CFLAGS +=	-D_FORTIFY_SOURCE=2
@@ -44,10 +45,13 @@ snapshot: turbostat 
	@echo "#define GENMASK(h, l) (((~0UL) << (l)) & (~0UL >> (sizeof(long) * 8 - 1 - (h))))" >> $(SNAPSHOT)/bits.h

	@echo "#define GENMASK_ULL(h, l) (((~0ULL) << (l)) & (~0ULL >> (sizeof(long long) * 8 - 1 - (h))))" >> $(SNAPSHOT)/bits.h



	@echo '#define BUILD_BUG_ON(cond) do { enum { compile_time_check ## __COUNTER__ = 1/(!(cond)) }; } while (0)' > $(SNAPSHOT)/build_bug.h



	@echo PWD=. > $(SNAPSHOT)/Makefile

	@echo "CFLAGS +=	-DMSRHEADER='\"msr-index.h\"'" >> $(SNAPSHOT)/Makefile

	@echo "CFLAGS +=	-DINTEL_FAMILY_HEADER='\"intel-family.h\"'" >> $(SNAPSHOT)/Makefile

	@sed -e's/.*MSRHEADER.*//' -e's/.*INTEL_FAMILY_HEADER.*//' Makefile >> $(SNAPSHOT)/Makefile

	@echo "CFLAGS +=	-DBUILD_BUG_HEADER='\"build_bug.h\"'" >> $(SNAPSHOT)/Makefile

	@sed -e's/.*MSRHEADER.*//' -e's/.*INTEL_FAMILY_HEADER.*//' -e's/.*BUILD_BUG_HEADER.*//' Makefile >> $(SNAPSHOT)/Makefile



	@rm -f $(SNAPSHOT).tar.gz

	tar cvzf $(SNAPSHOT).tar.gz $(SNAPSHOT)

tools/power/x86/turbostat/turbostat.c

+10 −10
Original line number Diff line number Diff line
@@ -10,6 +10,7 @@ 
#define _GNU_SOURCE

#include MSRHEADER

#include INTEL_FAMILY_HEADER

#include BUILD_BUG_HEADER

#include <stdarg.h>

#include <stdio.h>

#include <err.h>
@@ -38,7 +39,6 @@ 
#include <stdbool.h>

#include <assert.h>

#include <linux/kernel.h>

#include <linux/build_bug.h>



#define UNUSED(x) (void)(x)
@@ -5695,9 +5695,6 @@ static void probe_intel_uncore_frequency_cluster(void) 
	if (access("/sys/devices/system/cpu/intel_uncore_frequency/uncore00/current_freq_khz", R_OK))

		return;



	if (quiet)

		return;



	for (uncore_max_id = 0;; ++uncore_max_id) {



		sprintf(path_base, "/sys/devices/system/cpu/intel_uncore_frequency/uncore%02d", uncore_max_id);
@@ -5727,6 +5724,14 @@ static void probe_intel_uncore_frequency_cluster(void) 
		sprintf(path, "%s/fabric_cluster_id", path_base);

		cluster_id = read_sysfs_int(path);



		sprintf(path, "%s/current_freq_khz", path_base);

		sprintf(name_buf, "UMHz%d.%d", domain_id, cluster_id);



		add_counter(0, path, name_buf, 0, SCOPE_PACKAGE, COUNTER_K2M, FORMAT_AVERAGE, 0, package_id);



		if (quiet)

			continue;



		sprintf(path, "%s/min_freq_khz", path_base);

		k = read_sysfs_int(path);

		sprintf(path, "%s/max_freq_khz", path_base);
@@ -5743,11 +5748,6 @@ static void probe_intel_uncore_frequency_cluster(void) 
		sprintf(path, "%s/current_freq_khz", path_base);

		k = read_sysfs_int(path);

		fprintf(outf, " %d MHz\n", k / 1000);



		sprintf(path, "%s/current_freq_khz", path_base);

		sprintf(name_buf, "UMHz%d.%d", domain_id, cluster_id);



		add_counter(0, path, name_buf, 0, SCOPE_PACKAGE, COUNTER_K2M, FORMAT_AVERAGE, 0, package_id);

	}

}
@@ -8424,7 +8424,7 @@ void cmdline(int argc, char **argv) 
	 * Parse some options early, because they may make other options invalid,

	 * like adding the MSR counter with --add and at the same time using --no-msr.

	 */

	while ((opt = getopt_long_only(argc, argv, "MP", long_options, &option_index)) != -1) {

	while ((opt = getopt_long_only(argc, argv, "MPn:", long_options, &option_index)) != -1) {

		switch (opt) {

		case 'M':

			no_msr = 1;