Commit 46de87e3 authored by Zhang Rui's avatar Zhang Rui Committed by Srinivas Pandruvada
Browse files

tools/power/x86/intel-speed-select: Display punit info 



Display punit info for platforms with new api_version.
For platforms with old api_version, don't display the punit info to be
backward compatible.

For example:

Intel(R) Speed Select Technology
Executing on CPU model:173[0xad]
 package-0
  die-0
    powerdomain-0
      cpu-0
        get-config-current_level:0
 package-0
  die-0
    powerdomain-3
      cpu--1
        get-config-current_level:0
 package-0
  die-0
    powerdomain-4
      cpu--1
        get-config-current_level:0

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
[srinivas.pandruvada@linux.intel.com: changelog edits]
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
parent 79554aaa

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

+18 −21
Original line number Diff line number Diff line
@@ -169,21 +169,30 @@ static void format_and_print(FILE *outf, int level, char *header, char *value) 
static int print_package_info(struct isst_id *id, FILE *outf)

{

	char header[256];

	int level = 1;



	if (out_format_is_json()) {

		if (api_version() > 1)

			snprintf(header, sizeof(header), "package-%d:die-%d:powerdomain-%d:cpu-%d",

				 id->pkg, id->die, id->punit, id->cpu);

		else

			snprintf(header, sizeof(header), "package-%d:die-%d:cpu-%d",

				 id->pkg, id->die, id->cpu);

		format_and_print(outf, 1, header, NULL);

		format_and_print(outf, level, header, NULL);

		return 1;

	}

	snprintf(header, sizeof(header), "package-%d", id->pkg);

	format_and_print(outf, 1, header, NULL);

	format_and_print(outf, level++, header, NULL);

	snprintf(header, sizeof(header), "die-%d", id->die);

	format_and_print(outf, 2, header, NULL);

	format_and_print(outf, level++, header, NULL);

	if (api_version() > 1) {

		snprintf(header, sizeof(header), "powerdomain-%d", id->punit);

		format_and_print(outf, level++, header, NULL);

	}

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

	format_and_print(outf, 3, header, NULL);

	format_and_print(outf, level, header, NULL);



	return 3;

	return level;

}



static void _isst_pbf_display_information(struct isst_id *id, FILE *outf, int level,
@@ -306,22 +315,10 @@ static void _isst_fact_display_information(struct isst_id *id, FILE *outf, int l 
void isst_ctdp_display_core_info(struct isst_id *id, FILE *outf, char *prefix,

				 unsigned int val, char *str0, char *str1)

{

	char header[256];

	char value[256];

	int level = 1;

	int level = print_package_info(id, outf);



	if (out_format_is_json()) {

		snprintf(header, sizeof(header), "package-%d:die-%d:cpu-%d",

			 id->pkg, id->die, id->cpu);

		format_and_print(outf, level++, header, NULL);

	} else {

		snprintf(header, sizeof(header), "package-%d", id->pkg);

		format_and_print(outf, level++, header, NULL);

		snprintf(header, sizeof(header), "die-%d", id->die);

		format_and_print(outf, level++, header, NULL);

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

		format_and_print(outf, level++, header, NULL);

	}

	level++;



	if (str0 && !val)

		snprintf(value, sizeof(value), "%s", str0);