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

tools/power/x86/intel-speed-select: Turbo-freq feature auto mode 



Introduce --auto|-a option to turbo-freq enable feature, so that it
does in one step for users who are OK by setting all passed target cores
as high priority and set in CLOS 0 and remaining in CLOS 3. In this way,
users don't have to take multiple steps to enable turbo-freq feature. For
users who want more fine grain control, they can always use core-power
feature to set custom CLOS configuration and assignment.

While here also print the error to output when clos configuration fails.

For example
intel-speed-select -c 0-4 turbo-freq enable --auto

The above command will enable turbo-freq and core-power feature. Also
mark CPU 0 to CPU 4 as high priority.

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

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

+124 −28
Original line number Diff line number Diff line
@@ -1173,40 +1173,58 @@ static void set_fact_for_cpu(int cpu, void *arg1, void *arg2, void *arg3, 
	int ret;

	int status = *(int *)arg4;



	ret = isst_set_pbf_fact_status(cpu, 0, status);

	if (auto_mode) {

		if (status) {

			ret = isst_pm_qos_config(cpu, 1, 1);

			if (ret)

				goto disp_results;

		} else {

			isst_pm_qos_config(cpu, 0, 0);

		}

	}



	ret = isst_set_pbf_fact_status(cpu, 0, status);

	if (ret) {

		perror("isst_set_fact");

	else {

		if (auto_mode)

			isst_pm_qos_config(cpu, 0, 0);



		goto disp_results;

	}



	/* Set TRL */

	if (status) {

		struct isst_pkg_ctdp pkg_dev;



		ret = isst_get_ctdp_levels(cpu, &pkg_dev);

			if (ret) {

				isst_display_result(cpu, outf, "turbo-freq",

						    "enable", ret);

				return;

			}

		if (!ret)

			ret = isst_set_trl(cpu, fact_trl);

			isst_display_result(cpu, outf, "turbo-freq", "enable",

					    ret);

		if (ret && auto_mode)

			isst_pm_qos_config(cpu, 0, 0);

	}



disp_results:

	if (status) {

		isst_display_result(cpu, outf, "turbo-freq", "enable", ret);

	} else {

		/* Since we modified TRL during Fact enable, restore it */

		isst_set_trl_from_current_tdp(cpu, fact_trl);

			isst_display_result(cpu, outf, "turbo-freq", "disable",

					    ret);

		}

		isst_display_result(cpu, outf, "turbo-freq", "disable", ret);

	}

}



static void set_fact_enable(void)

{

	int status = 1;

	int status = 1, i, ret;



	if (cmd_help) {

		fprintf(stderr,

			"Enable Intel Speed Select Technology Turbo frequency feature\n");

		fprintf(stderr,

			"Optional: -t|--trl : Specify turbo ratio limit\n");

		fprintf(stderr,

			"\tOptional Arguments: -a|--auto : Designate specified target CPUs with");

		fprintf(stderr, "-C|--cpu option as as high priority using core-power feature\n");

		exit(0);

	}
@@ -1218,6 +1236,83 @@ static void set_fact_enable(void) 
		for_each_online_package_in_set(set_fact_for_cpu, NULL, NULL,

					       NULL, &status);

	isst_ctdp_display_information_end(outf);



	if (auto_mode) {

		/*

		 * When we adjust CLOS param, we have to set for siblings also.

		 * So for the each user specified CPU, also add the sibling

		 * in the present_cpu_mask.

		 */

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

			char buffer[128], sibling_list[128], *cpu_str;

			int fd, len;



			if (!CPU_ISSET_S(i, target_cpumask_size, target_cpumask))

				continue;



			snprintf(buffer, sizeof(buffer),

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



			fd = open(buffer, O_RDONLY);

			if (fd < 0)

				continue;



			len = read(fd, sibling_list, sizeof(sibling_list));

			close(fd);



			if (len < 0)

				continue;



			cpu_str = strtok(sibling_list, ",");

			while (cpu_str != NULL) {

				int cpu;



				sscanf(cpu_str, "%d", &cpu);

				CPU_SET_S(cpu, target_cpumask_size, target_cpumask);

				cpu_str = strtok(NULL, ",");

			}

		}



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

			int clos;



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

				continue;



			ret = set_clos_param(i, 0, 0, 0, 0, 0xff);

			if (ret)

				goto error_disp;



			ret = set_clos_param(i, 1, 15, 0, 0, 0xff);

			if (ret)

				goto error_disp;



			ret = set_clos_param(i, 2, 15, 0, 0, 0xff);

			if (ret)

				goto error_disp;



			ret = set_clos_param(i, 3, 15, 0, 0, 0xff);

			if (ret)

				goto error_disp;



			if (CPU_ISSET_S(i, target_cpumask_size, target_cpumask))

				clos = 0;

			else

				clos = 3;



			debug_printf("Associate cpu: %d clos: %d\n", i, clos);

			ret = isst_clos_associate(i, clos);

			if (ret)

				goto error_disp;

		}

		isst_display_result(i, outf, "turbo-freq --auto", "enable", 0);

	}



	return;



error_disp:

	isst_display_result(i, outf, "turbo-freq --auto", "enable", ret);



}



static void set_fact_disable(void)
@@ -1229,6 +1324,8 @@ static void set_fact_disable(void) 
			"Disable Intel Speed Select Technology turbo frequency feature\n");

		fprintf(stderr,

			"Optional: -t|--trl : Specify turbo ratio limit\n");

		fprintf(stderr,

			"\tOptional Arguments: -a|--auto : Also disable core-power associations\n");

		exit(0);

	}
@@ -1249,9 +1346,9 @@ static void enable_clos_qos_config(int cpu, void *arg1, void *arg2, void *arg3, 
	int status = *(int *)arg4;



	ret = isst_pm_qos_config(cpu, status, clos_priority_type);

	if (ret) {

	if (ret)

		perror("isst_pm_qos_config");

	} else {



	if (status)

		isst_display_result(cpu, outf, "core-power", "enable",

				    ret);
@@ -1259,7 +1356,6 @@ static void enable_clos_qos_config(int cpu, void *arg1, void *arg2, void *arg3, 
		isst_display_result(cpu, outf, "core-power", "disable",

				    ret);

}

}



static void set_clos_enable(void)

{

CRA Git | Maintained and supported by SUSTech CRA and CCSE