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

tools/power/x86/intel-speed-select: Introduce support for multi-punit 



New platforms may have more than 1 punit in a Package/Die, thus it can
have multiple power domains in a Package/Die. Package id and die id is not
sufficient to refer to a specific Power domain.

Introduce support for multi-punit per package/die.

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 57ef2436

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

+40 −32
Original line number Diff line number Diff line
@@ -502,46 +502,54 @@ void for_each_online_package_in_set(void (*callback)(struct isst_id *, void *, v 
				    void *arg1, void *arg2, void *arg3,

				    void *arg4)

{

	int max_packages[MAX_PACKAGE_COUNT * MAX_PACKAGE_COUNT];

	int pkg_index = 0, i;

	struct isst_id id;

	int cpus[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE][MAX_PUNIT_PER_DIE];

	int valid_mask[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE] = {0};

	int i, j, k;



	memset(cpus, -1, sizeof(cpus));



	memset(max_packages, 0xff, sizeof(max_packages));

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

		int j, online, pkg_id, die_id = 0, skip = 0;

		int online;



		if (!CPU_ISSET_S(i, present_cpumask_size, present_cpumask))

			continue;

		if (i)



		online = parse_int_file(

				1, "/sys/devices/system/cpu/cpu%d/online", i);

		else

			online =

				1; /* online entry for CPU 0 needs some special configs */

			i != 0, "/sys/devices/system/cpu/cpu%d/online", i);

		if (online < 0)

			online = 1; /* online entry for CPU 0 needs some special configs */



		die_id = get_physical_die_id(i);

		if (die_id < 0)

			die_id = 0;

		if (!online)

			continue;



		pkg_id = parse_int_file(0,

			"/sys/devices/system/cpu/cpu%d/topology/physical_package_id", i);

		if (pkg_id < 0)

		set_isst_id(&id, i);



		if (id.pkg < 0 || id.die < 0 || id.punit < 0)

			continue;



		/* Create an unique id for package, die combination to store */

		pkg_id = (MAX_PACKAGE_COUNT * pkg_id + die_id);

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



		for (j = 0; j < pkg_index; ++j) {

			if (max_packages[j] == pkg_id) {

				skip = 1;

				break;

			}

		if (cpus[id.pkg][id.die][id.punit] == -1)

			cpus[id.pkg][id.die][id.punit] = i;

	}



		set_isst_id(&id, i);

		if (!skip && online && callback) {

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

		for (j = 0; j < MAX_DIE_PER_PACKAGE; j++) {

			/*

			 * Fix me:

			 * How to check a non-cpu die for a package/die with all cpu offlined?

			 */

			if (!valid_mask[i][j])

				continue;

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

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

				id.pkg = i;

				id.die = j;

				id.punit = k;

				if (isst_is_punit_valid(&id))

					callback(&id, arg1, arg2, arg3, arg4);

			max_packages[pkg_index++] = pkg_id;

			}

		}

	}

}
@@ -626,7 +634,7 @@ void free_cpu_set(cpu_set_t *cpu_set) 
	CPU_FREE(cpu_set);

}



static int cpu_cnt[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE];

static int cpu_cnt[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE][MAX_PUNIT_PER_DIE];



int get_max_punit_core_id(struct isst_id *id)

{
@@ -648,10 +656,10 @@ int get_max_punit_core_id(struct isst_id *id) 


int get_cpu_count(struct isst_id *id)

{

	if (id->pkg < 0 || id->die < 0)

	if (id->pkg < 0 || id->die < 0 || id->punit < 0)

		return 0;



	return cpu_cnt[id->pkg][id->die];

	return cpu_cnt[id->pkg][id->die][id->punit];

}



static void create_cpu_map(void)
@@ -732,7 +740,7 @@ static void create_cpu_map(void) 


		cpu_map[i].initialized = 1;



		cpu_cnt[pkg_id][die_id]++;

		cpu_cnt[pkg_id][die_id][punit_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-daemon.c

+11 −10
Original line number Diff line number Diff line
@@ -20,16 +20,17 @@ 


#include "isst.h"



static int per_package_levels_info[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE];

static time_t per_package_levels_tm[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE];

static int per_package_levels_info[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE][MAX_PUNIT_PER_DIE];

static time_t per_package_levels_tm[MAX_PACKAGE_COUNT][MAX_DIE_PER_PACKAGE][MAX_PUNIT_PER_DIE];



static void init_levels(void)

{

	int i, j;

	int i, j, k;



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

		for (j = 0; j < MAX_DIE_PER_PACKAGE; ++j)

			per_package_levels_info[i][j] = -1;

			for (k = 0; k < MAX_PUNIT_PER_DIE; ++k)

				per_package_levels_info[i][j][k] = -1;

}



void process_level_change(struct isst_id *id)
@@ -39,16 +40,16 @@ void process_level_change(struct isst_id *id) 
	time_t tm;

	int ret;



	if (id->pkg < 0 || id->die < 0) {

	if (id->pkg < 0 || id->die < 0 || id->punit < 0) {

		debug_printf("Invalid package/die info for cpu:%d\n", id->cpu);

		return;

	}



	tm = time(NULL);

	if (tm - per_package_levels_tm[id->pkg][id->die] < 2)

	if (tm - per_package_levels_tm[id->pkg][id->die][id->punit] < 2)

		return;



	per_package_levels_tm[id->pkg][id->die] = tm;

	per_package_levels_tm[id->pkg][id->die][id->punit] = tm;



	ret = isst_get_ctdp_levels(id, &pkg_dev);

	if (ret) {
@@ -64,14 +65,14 @@ void process_level_change(struct isst_id *id) 
		return;

	}



	if (per_package_levels_info[id->pkg][id->die] == pkg_dev.current_level)

	if (per_package_levels_info[id->pkg][id->die][id->punit] == pkg_dev.current_level)

		return;



	debug_printf("**Config level change for cpu:%d pkg:%d die:%d from %d to %d\n",

		      id->cpu, id->pkg, id->die, per_package_levels_info[id->pkg][id->die],

		      id->cpu, id->pkg, id->die, per_package_levels_info[id->pkg][id->die][id->punit],

		      pkg_dev.current_level);



	per_package_levels_info[id->pkg][id->die] = pkg_dev.current_level;

	per_package_levels_info[id->pkg][id->die][id->punit] = pkg_dev.current_level;



	ctdp_level.core_cpumask_size =

		alloc_cpu_set(&ctdp_level.core_cpumask);