Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5202e32d authored by Rafael J. Wysocki's avatar Rafael J. Wysocki
Browse files

Merge tag 'linux-cpupower-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux 

Pull cpupower updates for v4.18-rc1 from Shuah Khan:

"This cpupower update for 4.18-rc1 consists of two minor fixes."

* tag 'linux-cpupower-4.18-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower : Fix header name to read idle state name
  cpupower: fix spelling mistake: "logilename" -> "logfilename"
parents 3c89adb0 f9652d5c

tools/power/cpupower/bench/parse.c

+1 −1
Original line number Diff line number Diff line
@@ -104,7 +104,7 @@ FILE *prepare_output(const char *dirname) 
			dirname, time(NULL));

	}



	dprintf("logilename: %s\n", filename);

	dprintf("logfilename: %s\n", filename);



	output = fopen(filename, "w+");

	if (output == NULL) {

tools/power/cpupower/utils/idle_monitor/cpuidle_sysfs.c

+15 −0
Original line number Diff line number Diff line
@@ -126,6 +126,20 @@ void fix_up_intel_idle_driver_name(char *tmp, int num) 
	}

}



#ifdef __powerpc__

void map_power_idle_state_name(char *tmp)

{

	if (!strncmp(tmp, "stop0_lite", CSTATE_NAME_LEN))

		strcpy(tmp, "stop0L");

	else if (!strncmp(tmp, "stop1_lite", CSTATE_NAME_LEN))

		strcpy(tmp, "stop1L");

	else if (!strncmp(tmp, "stop2_lite", CSTATE_NAME_LEN))

		strcpy(tmp, "stop2L");

}

#else

void map_power_idle_state_name(char *tmp) { }

#endif



static struct cpuidle_monitor *cpuidle_register(void)

{

	int num;
@@ -145,6 +159,7 @@ static struct cpuidle_monitor *cpuidle_register(void) 
		if (tmp == NULL)

			continue;



		map_power_idle_state_name(tmp);

		fix_up_intel_idle_driver_name(tmp, num);

		strncpy(cpuidle_cstates[num].name, tmp, CSTATE_NAME_LEN - 1);

		free(tmp);

tools/power/cpupower/utils/idle_monitor/cpupower-monitor.c

+20 −15
Original line number Diff line number Diff line
@@ -70,36 +70,43 @@ void print_n_spaces(int n) 
		printf(" ");

}



/* size of s must be at least n + 1 */

/*s is filled with left and right spaces

 *to make its length atleast n+1

 */

int fill_string_with_spaces(char *s, int n)

{

	char *temp;

	int len = strlen(s);

	if (len > n)



	if (len >= n)

		return -1;



	temp = malloc(sizeof(char) * (n+1));

	for (; len < n; len++)

		s[len] = ' ';

	s[len] = '\0';

	snprintf(temp, n+1, " %s", s);

	strcpy(s, temp);

	free(temp);

	return 0;

}



#define MAX_COL_WIDTH 6

void print_header(int topology_depth)

{

	int unsigned mon;

	int state, need_len;

	cstate_t s;

	char buf[128] = "";

	int percent_width = 4;



	fill_string_with_spaces(buf, topology_depth * 5 - 1);

	printf("%s|", buf);



	for (mon = 0; mon < avail_monitors; mon++) {

		need_len = monitors[mon]->hw_states_num * (percent_width + 3)

		need_len = monitors[mon]->hw_states_num * (MAX_COL_WIDTH + 1)

			- 1;

		if (mon != 0) {

		if (mon != 0)

			printf("||");

			need_len--;

		}

		sprintf(buf, "%s", monitors[mon]->name);

		fill_string_with_spaces(buf, need_len);

		printf("%s", buf);
@@ -116,14 +123,12 @@ void print_header(int topology_depth) 
	for (mon = 0; mon < avail_monitors; mon++) {

		if (mon != 0)

			printf("||");

		else

			printf(" ");

		for (state = 0; state < monitors[mon]->hw_states_num; state++) {

			if (state != 0)

				printf("|");

			s = monitors[mon]->hw_states[state];

			sprintf(buf, "%s", s.name);

			fill_string_with_spaces(buf, percent_width);

			fill_string_with_spaces(buf, MAX_COL_WIDTH);

			printf("%s", buf);

		}

		printf(" ");

tools/power/cpupower/utils/idle_monitor/cpupower-monitor.h

+9 −0
Original line number Diff line number Diff line
@@ -15,7 +15,16 @@ 


#define MONITORS_MAX 20

#define MONITOR_NAME_LEN 20



/* CSTATE_NAME_LEN is limited by header field width defined

 * in cpupower-monitor.c. Header field width is defined to be

 * sum of percent width and two spaces for padding.

 */

#ifdef __powerpc__

#define CSTATE_NAME_LEN 7

#else

#define CSTATE_NAME_LEN 5

#endif

#define CSTATE_DESC_LEN 60



int cpu_count;