Commit a1ce5ba2 authored by Dominik Brodowski's avatar Dominik Brodowski
Browse files

cpupowerutils: utils - ConfigStyle bugfixes 



Signed-off-by: default avatarDominik Brodowski <linux@dominikbrodowski.net>
parent 2cd005ca

tools/power/cpupower/utils/cpufreq-info.c

+68 −55
Original line number Diff line number Diff line
@@ -48,7 +48,7 @@ static unsigned int count_cpus(void) 
	fclose(fp);



	/* cpu count starts from 0, on error return 1 (UP) */

	return (ret+1);

	return ret + 1;

}
@@ -75,7 +75,8 @@ static void proc_cpufreq_output(void) 
			max_pctg = (policy->max * 100) / max;

		}

		printf("CPU%3d    %9lu kHz (%3d %%)  -  %9lu kHz (%3d %%)  -  %s\n",

		       cpu , policy->min, max ? min_pctg : 0, policy->max, max ? max_pctg : 0, policy->governor);

			cpu , policy->min, max ? min_pctg : 0, policy->max,

			max ? max_pctg : 0, policy->governor);



		cpufreq_put_policy(policy);

	}
@@ -137,7 +138,8 @@ static void print_duration(unsigned long duration) 


/* --boost / -b */



static int get_boost_mode(unsigned int cpu) {

static int get_boost_mode(unsigned int cpu)

{

	int support, active, b_states = 0, ret, pstate_no, i;

	/* ToDo: Make this more global */

	unsigned long pstates[MAX_HW_PSTATES] = {0,};
@@ -199,9 +201,8 @@ static void debug_output_one(unsigned int cpu) 
	struct cpufreq_available_governors *governors;

	struct cpufreq_stats *stats;



	if (cpufreq_cpu_exists(cpu)) {

	if (cpufreq_cpu_exists(cpu))

		return;

	}



	freq_kernel = cpufreq_get_freq_kernel(cpu);

	freq_hardware = cpufreq_get_freq_hardware(cpu);
@@ -294,8 +295,7 @@ static void debug_output_one(unsigned int cpu) 
		if (freq_hardware) {

			print_speed(freq_hardware);

			printf(_(" (asserted by call to hardware)"));

		}

		else

		} else

			print_speed(freq_kernel);

		printf(".\n");

	}
@@ -322,7 +322,8 @@ static void debug_output_one(unsigned int cpu) 


/* --freq / -f */



static int get_freq_kernel(unsigned int cpu, unsigned int human) {

static int get_freq_kernel(unsigned int cpu, unsigned int human)

{

	unsigned long freq = cpufreq_get_freq_kernel(cpu);

	if (!freq)

		return -EINVAL;
@@ -337,7 +338,8 @@ static int get_freq_kernel(unsigned int cpu, unsigned int human) { 


/* --hwfreq / -w */



static int get_freq_hardware(unsigned int cpu, unsigned int human) {

static int get_freq_hardware(unsigned int cpu, unsigned int human)

{

	unsigned long freq = cpufreq_get_freq_hardware(cpu);

	if (!freq)

		return -EINVAL;
@@ -351,7 +353,8 @@ static int get_freq_hardware(unsigned int cpu, unsigned int human) { 


/* --hwlimits / -l */



static int get_hardware_limits(unsigned int cpu) {

static int get_hardware_limits(unsigned int cpu)

{

	unsigned long min, max;

	if (cpufreq_get_hardware_limits(cpu, &min, &max))

		return -EINVAL;
@@ -361,7 +364,8 @@ static int get_hardware_limits(unsigned int cpu) { 


/* --driver / -d */



static int get_driver(unsigned int cpu) {

static int get_driver(unsigned int cpu)

{

	char *driver = cpufreq_get_driver(cpu);

	if (!driver)

		return -EINVAL;
@@ -372,7 +376,8 @@ static int get_driver(unsigned int cpu) { 


/* --policy / -p */



static int get_policy(unsigned int cpu) {

static int get_policy(unsigned int cpu)

{

	struct cpufreq_policy *policy = cpufreq_get_policy(cpu);

	if (!policy)

		return -EINVAL;
@@ -383,8 +388,10 @@ static int get_policy(unsigned int cpu) { 


/* --governors / -g */



static int get_available_governors(unsigned int cpu) {

	struct cpufreq_available_governors *governors = cpufreq_get_available_governors(cpu);

static int get_available_governors(unsigned int cpu)

{

	struct cpufreq_available_governors *governors =

		cpufreq_get_available_governors(cpu);

	if (!governors)

		return -EINVAL;
@@ -400,7 +407,8 @@ static int get_available_governors(unsigned int cpu) { 


/* --affected-cpus  / -a */



static int get_affected_cpus(unsigned int cpu) {

static int get_affected_cpus(unsigned int cpu)

{

	struct cpufreq_affected_cpus *cpus = cpufreq_get_affected_cpus(cpu);

	if (!cpus)

		return -EINVAL;
@@ -416,7 +424,8 @@ static int get_affected_cpus(unsigned int cpu) { 


/* --related-cpus  / -r */



static int get_related_cpus(unsigned int cpu) {

static int get_related_cpus(unsigned int cpu)

{

	struct cpufreq_affected_cpus *cpus = cpufreq_get_related_cpus(cpu);

	if (!cpus)

		return -EINVAL;
@@ -432,17 +441,19 @@ static int get_related_cpus(unsigned int cpu) { 


/* --stats / -s */



static int get_freq_stats(unsigned int cpu, unsigned int human) {

static int get_freq_stats(unsigned int cpu, unsigned int human)

{

	unsigned long total_trans = cpufreq_get_transitions(cpu);

	unsigned long long total_time;

	struct cpufreq_stats *stats = cpufreq_get_stats(cpu, &total_time);

	while (stats) {

		if (human) {

			print_speed(stats->frequency);

			printf(":%.2f%%", (100.0 * stats->time_in_state) / total_time);

		}

		else

			printf("%lu:%llu", stats->frequency, stats->time_in_state);

			printf(":%.2f%%",

				(100.0 * stats->time_in_state) / total_time);

		} else

			printf("%lu:%llu",

				stats->frequency, stats->time_in_state);

		stats = stats->next;

		if (stats)

			printf(", ");
@@ -455,7 +466,8 @@ static int get_freq_stats(unsigned int cpu, unsigned int human) { 


/* --latency / -y */



static int get_latency(unsigned int cpu, unsigned int human) {

static int get_latency(unsigned int cpu, unsigned int human)

{

	unsigned long latency = cpufreq_get_transition_latency(cpu);

	if (!latency)

		return -EINVAL;
@@ -468,7 +480,8 @@ static int get_latency(unsigned int cpu, unsigned int human) { 
	return 0;

}



void freq_info_help(void) {

void freq_info_help(void)

{

	printf(_("Usage: cpupower freqinfo [options]\n"));

	printf(_("Options:\n"));

	printf(_("  -e, --debug          Prints out debug information [default]\n"));
@@ -659,7 +672,7 @@ int cmd_freq_info(int argc, char **argv) 
			break;

		}

		if (ret)

			return (ret);

			return ret;

	}

	return ret;

}

tools/power/cpupower/utils/cpufreq-set.c

+13 −12
Original line number Diff line number Diff line
@@ -204,7 +204,8 @@ static int do_one_cpu(unsigned int cpu, struct cpufreq_policy *new_pol, 
		else if (new_pol->max)

			return cpufreq_modify_policy_max(cpu, new_pol->max);

		else if (new_pol->governor)

			return cpufreq_modify_policy_governor(cpu, new_pol->governor);

			return cpufreq_modify_policy_governor(cpu,

							new_pol->governor);



	default:

		/* slow path */

tools/power/cpupower/utils/cpuidle-info.c

+13 −14
Original line number Diff line number Diff line
@@ -31,8 +31,7 @@ static void cpuidle_cpu_output(unsigned int cpu, int verbose) 
	if (idlestates == 0) {

		printf(_("CPU %u: No idle states\n"), cpu);

		return;

	}

	else if (idlestates <= 0) {

	} else if (idlestates <= 0) {

		printf(_("CPU %u: Can't read idle state info\n"), cpu);

		return;

	}
@@ -117,8 +116,7 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) 
		 *	printf(_("CPU %u: No C-states available\n"), cpu);

		 *	return;

		 */

	}

	else if (cstates <= 0) {

	} else if (cstates <= 0) {

		printf(_("CPU %u: Can't read C-state info\n"), cpu);

		return;

	}
@@ -143,7 +141,8 @@ static void proc_cpuidle_cpu_output(unsigned int cpu) 


/* --freq / -f */



void idle_info_help(void) {

void idle_info_help(void)

{

	printf(_ ("Usage: cpupower idleinfo [options]\n"));

	printf(_ ("Options:\n"));

	printf(_ ("  -s, --silent         Only show general C-state information\n"));
@@ -241,5 +240,5 @@ int cmd_idle_info(int argc, char **argv) 
			break;

		}

	}

	return (EXIT_SUCCESS);

	return EXIT_SUCCESS;

}

tools/power/cpupower/utils/cpupower-info.c

+8 −9
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ int cmd_info(int argc, char **argv) 
			int perf_bias:1;

		};

		int params;

			

	} params = {};

	int ret = 0;

tools/power/cpupower/utils/cpupower-set.c

+8 −8
Original line number Diff line number Diff line
@@ -57,7 +57,6 @@ int cmd_set(int argc, char **argv) 
			int perf_bias:1;

		};

		int params;

			

	} params;

	int sched_mc = 0, sched_smt = 0, perf_bias = 0;

	int ret = 0;
@@ -67,7 +66,8 @@ int cmd_set(int argc, char **argv) 


	params.params = 0;

	/* parameter parsing */

	while ((ret = getopt_long(argc, argv, "m:s:b:h", set_opts, NULL)) != -1) {

	while ((ret = getopt_long(argc, argv, "m:s:b:h",

						set_opts, NULL)) != -1) {

		switch (ret) {

		case 'h':

			set_help();