Commit b3abfd77 authored by Srinivas Pandruvada's avatar Srinivas Pandruvada Committed by Andy Shevchenko
Browse files

tools/power/x86/intel-speed-select: Fix perf-profile command output 



commit "c016ae8f9fa04d361efc8629de49ad3af12b5262
"tools/power/x86/intel-speed-select: Output success/failed for command
output" introduced a regression in perf-profile outputs. With this
the result field is changed to string interpreting every non zero
value as errors. But these commands display on zero (>0) result.
For example before this commit the display was:

package-1
  die-0
    cpu-14
        get-config-levels:4

Here the get-config-levels is interpreted as error and displayed
as error with the above commit:

package-1
  die-0
    cpu-14
        get-config-levels:failed(error 4)

Fix this issue by not using isst_display_result() to display such results,
but define a new function which formats this data and prints.

Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Signed-off-by: default avatarAndy Shevchenko <andriy.shevchenko@linux.intel.com>
parent 188afed9

tools/power/x86/intel-speed-select/isst-config.c

+2 −2
Original line number Diff line number Diff line
@@ -673,7 +673,7 @@ static void exec_on_get_ctdp_cpu(int cpu, void *arg1, void *arg2, void *arg3, 
	if (ret)

		perror("get_tdp_*");

	else

		isst_display_result(cpu, outf, "perf-profile", (char *)arg3,

		isst_ctdp_display_core_info(cpu, outf, arg3,

					    *(unsigned int *)arg4);

}

tools/power/x86/intel-speed-select/isst-display.c

+20 −0
Original line number Diff line number Diff line
@@ -287,6 +287,26 @@ static void _isst_fact_display_information(int cpu, FILE *outf, int level, 
	format_and_print(outf, base_level + 2, header, value);

}



void isst_ctdp_display_core_info(int cpu, FILE *outf, char *prefix,

				 unsigned int val)

{

	char header[256];

	char value[256];



	snprintf(header, sizeof(header), "package-%d",

		 get_physical_package_id(cpu));

	format_and_print(outf, 1, header, NULL);

	snprintf(header, sizeof(header), "die-%d", get_physical_die_id(cpu));

	format_and_print(outf, 2, header, NULL);

	snprintf(header, sizeof(header), "cpu-%d", cpu);

	format_and_print(outf, 3, header, NULL);



	snprintf(value, sizeof(value), "%u", val);

	format_and_print(outf, 4, prefix, value);



	format_and_print(outf, 1, NULL, NULL);

}



void isst_ctdp_display_information(int cpu, FILE *outf, int tdp_level,

				   struct isst_pkg_ctdp *pkg_dev)

{

tools/power/x86/intel-speed-select/isst.h

+2 −1
Original line number Diff line number Diff line
@@ -195,6 +195,8 @@ extern void isst_get_process_ctdp_complete(int cpu, 
					   struct isst_pkg_ctdp *pkg_dev);

extern void isst_ctdp_display_information(int cpu, FILE *outf, int tdp_level,

					  struct isst_pkg_ctdp *pkg_dev);

extern void isst_ctdp_display_core_info(int cpu, FILE *outf, char *prefix,

					unsigned int val);

extern void isst_ctdp_display_information_start(FILE *outf);

extern void isst_ctdp_display_information_end(FILE *outf);

extern void isst_pbf_display_information(int cpu, FILE *outf, int level,
@@ -235,5 +237,4 @@ extern void isst_display_result(int cpu, FILE *outf, char *feature, char *cmd, 
extern int isst_clos_get_clos_information(int cpu, int *enable, int *type);

extern void isst_clos_display_clos_information(int cpu, FILE *outf,

					       int clos_enable, int type);



#endif