Unverified Commit f895f249 authored by Ilpo Järvinen's avatar Ilpo Järvinen
Browse files

Merge branch 'intel-sst' of https://github.com/spandruvada/linux-kernel into review-ilpo-next

parents 6ad1b2dc 7dd55636

tools/power/x86/intel-speed-select/Makefile

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ endif 
# Do not use make's built-in rules

# (this improves performance and avoids hard-to-debug behaviour);

MAKEFLAGS += -r

override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -I/usr/include/libnl3

override CFLAGS += -O2 -Wall -g -D_GNU_SOURCE -I$(OUTPUT)include -I$(shell $(CC) -print-sysroot)/usr/include/libnl3

override LDFLAGS += -lnl-genl-3 -lnl-3



ALL_TARGETS := intel-speed-select

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

+15 −7
Original line number Diff line number Diff line
@@ -16,7 +16,7 @@ struct process_cmd_struct { 
	int arg;

};



static const char *version_str = "v1.21";

static const char *version_str = "v1.22";



static const int supported_api_ver = 3;

static struct isst_if_platform_info isst_platform_info;
@@ -46,8 +46,9 @@ static int force_online_offline; 
static int auto_mode;

static int fact_enable_fail;

static int cgroupv2;

static int max_pkg_id;

static int max_die_id;

static int max_punit_id;

static int max_die_id_package_0;



/* clos related */

static int current_clos = -1;
@@ -557,6 +558,8 @@ void for_each_online_power_domain_in_set(void (*callback)(struct isst_id *, void 
		if (id.pkg < 0 || id.die < 0 || id.punit < 0)

			continue;



		id.die = id.die % (max_die_id_package_0 + 1);



		valid_mask[id.pkg][id.die] = 1;



		if (cpus[id.pkg][id.die][id.punit] == -1)
@@ -564,11 +567,11 @@ void for_each_online_power_domain_in_set(void (*callback)(struct isst_id *, void 
	}



	for (i = 0; i < MAX_PACKAGE_COUNT; i++) {

		if (max_die_id == max_punit_id) {

		if (max_die_id > max_pkg_id) {

			for (k = 0; k < MAX_PUNIT_PER_DIE && k < MAX_DIE_PER_PACKAGE; k++) {

				id.cpu = cpus[i][k][k];

				id.pkg = i;

				id.die = k;

				id.die = get_physical_die_id(id.cpu);

				id.punit = k;

				if (isst_is_punit_valid(&id))

					callback(&id, arg1, arg2, arg3, arg4);
@@ -586,7 +589,10 @@ void for_each_online_power_domain_in_set(void (*callback)(struct isst_id *, void 
			for (k = 0; k < MAX_PUNIT_PER_DIE; k++) {

				id.cpu = cpus[i][j][k];

				id.pkg = i;

				id.die = j;

				if (id.cpu >= 0)

					id.die = get_physical_die_id(id.cpu);

				else

					id.die = id.pkg;

				id.punit = k;

				if (isst_is_punit_valid(&id))

					callback(&id, arg1, arg2, arg3, arg4);
@@ -788,6 +794,8 @@ static void create_cpu_map(void) 
		cpu_map[i].die_id = die_id;

		cpu_map[i].core_id = core_id;



		if (max_pkg_id < pkg_id)

			max_pkg_id = pkg_id;



		punit_id = 0;
@@ -812,8 +820,8 @@ static void create_cpu_map(void) 
		if (max_die_id < die_id)

			max_die_id = die_id;



		if (max_punit_id < cpu_map[i].punit_id)

			max_punit_id = cpu_map[i].punit_id;

		if (!pkg_id && max_die_id_package_0 < die_id)

			max_die_id_package_0 = die_id;



		debug_printf(

			"map logical_cpu:%d core: %d die:%d pkg:%d punit:%d punit_cpu:%d punit_core:%d\n",

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

+9 −2
Original line number Diff line number Diff line
@@ -173,7 +173,11 @@ static int print_package_info(struct isst_id *id, FILE *outf) 


	if (out_format_is_json()) {

		if (api_version() > 1) {

			if (id->cpu < 0)

			if (id->die < 0 && id->cpu < 0)

				snprintf(header, sizeof(header),

					 "package-%d:die-IO:powerdomain-%d:cpu-None",

					 id->pkg, id->punit);

			else if (id->cpu < 0)

				snprintf(header, sizeof(header),

					 "package-%d:die-%d:powerdomain-%d:cpu-None",

					 id->pkg, id->die, id->punit);
@@ -190,6 +194,9 @@ static int print_package_info(struct isst_id *id, FILE *outf) 
	}

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

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

	if (id->die < 0)

		snprintf(header, sizeof(header), "die-IO");

	else

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

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

	if (api_version() > 1) {