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

tools/power/x86/intel-speed-select: Rename for_each_online_package_in_set 



for_each_online_package_in_set is actually used to invoke callback for
each power domain.
This is not a problem when there is a single power domain within a
package/die, but it does not reflect the truth in multi-punit case.

Rename for_each_online_package_in_set to
for_each_online_power_domain_in_set.

Signed-off-by: default avatarZhang Rui <rui.zhang@intel.com>
Signed-off-by: default avatarSrinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
parent b4edf385

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

+13 −13
Original line number Diff line number Diff line
@@ -497,7 +497,7 @@ static void force_all_cpus_online(void) 
	unlink("/var/run/isst_cpu_topology.dat");

}



void for_each_online_package_in_set(void (*callback)(struct isst_id *, void *, void *,

void for_each_online_power_domain_in_set(void (*callback)(struct isst_id *, void *, void *,

						     void *, void *),

				    void *arg1, void *arg2, void *arg3,

				    void *arg4)
@@ -1150,7 +1150,7 @@ static void exec_on_get_ctdp_cpu(struct isst_id *id, void *arg1, void *arg2, voi 
				exec_on_get_ctdp_cpu, isst_get_ctdp_##suffix,     \

				&ctdp, desc, &ctdp.object);                       \

		else                                                              \

			for_each_online_package_in_set(exec_on_get_ctdp_cpu,      \

			for_each_online_power_domain_in_set(exec_on_get_ctdp_cpu,      \

						       isst_get_ctdp_##suffix,    \

						       &ctdp, desc,               \

						       &ctdp.object);             \
@@ -1354,7 +1354,7 @@ static void dump_isst_config(int arg) 
	if (max_target_cpus)

		for_each_online_target_cpu_in_set(fn, NULL, NULL, NULL, NULL);

	else

		for_each_online_package_in_set(fn, NULL, NULL, NULL, NULL);

		for_each_online_power_domain_in_set(fn, NULL, NULL, NULL, NULL);



	isst_ctdp_display_information_end(outf);

}
@@ -1465,7 +1465,7 @@ static void set_tdp_level(int arg) 
		for_each_online_target_cpu_in_set(set_tdp_level_for_cpu, NULL,

						  NULL, NULL, NULL);

	else

		for_each_online_package_in_set(set_tdp_level_for_cpu, NULL,

		for_each_online_power_domain_in_set(set_tdp_level_for_cpu, NULL,

					       NULL, NULL, NULL);

	isst_ctdp_display_information_end(outf);

}
@@ -1534,7 +1534,7 @@ static void dump_pbf_config(int arg) 
	if (max_target_cpus)

		for_each_online_target_cpu_in_set(fn, NULL, NULL, NULL, NULL);

	else

		for_each_online_package_in_set(fn, NULL, NULL, NULL, NULL);

		for_each_online_power_domain_in_set(fn, NULL, NULL, NULL, NULL);



	isst_ctdp_display_information_end(outf);

}
@@ -1940,7 +1940,7 @@ static void set_pbf_enable(int arg) 
		for_each_online_target_cpu_in_set(set_pbf_for_cpu, NULL, NULL,

						  NULL, &enable);

	else

		for_each_online_package_in_set(set_pbf_for_cpu, NULL, NULL,

		for_each_online_power_domain_in_set(set_pbf_for_cpu, NULL, NULL,

					       NULL, &enable);

	isst_ctdp_display_information_end(outf);

}
@@ -1986,7 +1986,7 @@ static void dump_fact_config(int arg) 
		for_each_online_target_cpu_in_set(dump_fact_config_for_cpu,

						  NULL, NULL, NULL, NULL);

	else

		for_each_online_package_in_set(dump_fact_config_for_cpu, NULL,

		for_each_online_power_domain_in_set(dump_fact_config_for_cpu, NULL,

					       NULL, NULL, NULL);

	isst_ctdp_display_information_end(outf);

}
@@ -2095,7 +2095,7 @@ static void set_fact_enable(int arg) 
		for_each_online_target_cpu_in_set(set_fact_for_cpu, NULL, NULL,

						  NULL, &enable);

	else

		for_each_online_package_in_set(set_fact_for_cpu, NULL, NULL,

		for_each_online_power_domain_in_set(set_fact_for_cpu, NULL, NULL,

					       NULL, &enable);

	isst_ctdp_display_information_end(outf);
@@ -2234,7 +2234,7 @@ static void set_clos_enable(int arg) 
		for_each_online_target_cpu_in_set(enable_clos_qos_config, NULL,

						  NULL, NULL, &enable);

	else

		for_each_online_package_in_set(enable_clos_qos_config, NULL,

		for_each_online_power_domain_in_set(enable_clos_qos_config, NULL,

					       NULL, NULL, &enable);

	isst_ctdp_display_information_end(outf);

}
@@ -2273,7 +2273,7 @@ static void dump_clos_config(int arg) 
		for_each_online_target_cpu_in_set(dump_clos_config_for_cpu,

						  NULL, NULL, NULL, NULL);

	else

		for_each_online_package_in_set(dump_clos_config_for_cpu, NULL,

		for_each_online_power_domain_in_set(dump_clos_config_for_cpu, NULL,

					       NULL, NULL, NULL);

	isst_ctdp_display_information_end(outf);

}
@@ -2309,7 +2309,7 @@ static void dump_clos_info(int arg) 
		for_each_online_target_cpu_in_set(get_clos_info_for_cpu, NULL,

						  NULL, NULL, NULL);

	else

		for_each_online_package_in_set(get_clos_info_for_cpu, NULL,

		for_each_online_power_domain_in_set(get_clos_info_for_cpu, NULL,

					       NULL, NULL, NULL);

	isst_ctdp_display_information_end(outf);
@@ -2381,7 +2381,7 @@ static void set_clos_config(int arg) 
		for_each_online_target_cpu_in_set(set_clos_config_for_cpu, NULL,

						  NULL, NULL, NULL);

	else

		for_each_online_package_in_set(set_clos_config_for_cpu, NULL,

		for_each_online_power_domain_in_set(set_clos_config_for_cpu, NULL,

					       NULL, NULL, NULL);

	isst_ctdp_display_information_end(outf);

}
@@ -2548,7 +2548,7 @@ static void process_trl(int arg) 
		for_each_online_target_cpu_in_set(get_set_trl, NULL,

						  NULL, NULL, &arg);

	else

		for_each_online_package_in_set(get_set_trl, NULL,

		for_each_online_power_domain_in_set(get_set_trl, NULL,

					       NULL, NULL, &arg);

	isst_ctdp_display_information_end(outf);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -109,7 +109,7 @@ static void _poll_for_config_change(struct isst_id *id, void *arg1, void *arg2, 


static void poll_for_config_change(void)

{

	for_each_online_package_in_set(_poll_for_config_change, NULL, NULL,

	for_each_online_power_domain_in_set(_poll_for_config_change, NULL, NULL,

				       NULL, NULL);

}

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

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ extern int is_icx_platform(void); 
extern void isst_trl_display_information(struct isst_id *id, FILE *outf, unsigned long long trl);



extern void set_cpu_online_offline(int cpu, int state);

extern void for_each_online_package_in_set(void (*callback)(struct isst_id *, void *, void *,

extern void for_each_online_power_domain_in_set(void (*callback)(struct isst_id *, void *, void *,

							    void *, void *),

					   void *arg1, void *arg2, void *arg3,

					   void *arg4);