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

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

Merge branch 'pm-tools' 

* pm-tools:
  tools/power/cpupower: allow running without cpu0
  pm-graph: package makefile and man pages
  pm-graph: AnalyzeBoot v2.1
  pm-graph: AnalyzeSuspend v4.7
parents 4afbce7b d0e4a193

tools/power/cpupower/utils/cpupower.c

+12 −3
Original line number Diff line number Diff line
@@ -12,6 +12,7 @@ 
#include <string.h>

#include <unistd.h>

#include <errno.h>

#include <sched.h>

#include <sys/types.h>

#include <sys/stat.h>

#include <sys/utsname.h>
@@ -31,6 +32,7 @@ static int cmd_help(int argc, const char **argv); 
 */

struct cpupower_cpu_info cpupower_cpu_info;

int run_as_root;

int base_cpu;

/* Affected cpus chosen by -c/--cpu param */

struct bitmask *cpus_chosen;
@@ -174,6 +176,7 @@ int main(int argc, const char *argv[]) 
	unsigned int i, ret;

	struct stat statbuf;

	struct utsname uts;

	char pathname[32];



	cpus_chosen = bitmask_alloc(sysconf(_SC_NPROCESSORS_CONF));
@@ -198,18 +201,24 @@ int main(int argc, const char *argv[]) 
		argv[0] = cmd = "help";

	}



	get_cpu_info(0, &cpupower_cpu_info);

	base_cpu = sched_getcpu();

	if (base_cpu < 0) {

		fprintf(stderr, _("No valid cpus found.\n"));

		return EXIT_FAILURE;

	}



	get_cpu_info(&cpupower_cpu_info);

	run_as_root = !geteuid();

	if (run_as_root) {

		ret = uname(&uts);

		sprintf(pathname, "/dev/cpu/%d/msr", base_cpu);

		if (!ret && !strcmp(uts.machine, "x86_64") &&

		    stat("/dev/cpu/0/msr", &statbuf) != 0) {

		    stat(pathname, &statbuf) != 0) {

			if (system("modprobe msr") == -1)

	fprintf(stderr, _("MSR access not available.\n"));

		}

	}





	for (i = 0; i < ARRAY_SIZE(commands); i++) {

		struct cmd_struct *p = commands + i;

		if (strcmp(p->cmd, cmd))

tools/power/cpupower/utils/helpers/cpuid.c

+2 −2
Original line number Diff line number Diff line
@@ -42,7 +42,7 @@ cpuid_func(edx); 
 *

 * TBD: Should there be a cpuid alternative for this if /proc is not mounted?

 */

int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info)

int get_cpu_info(struct cpupower_cpu_info *cpu_info)

{

	FILE *fp;

	char value[64];
@@ -70,7 +70,7 @@ int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info) 
		if (!strncmp(value, "processor\t: ", 12))

			sscanf(value, "processor\t: %u", &proc);



		if (proc != cpu)

		if (proc != (unsigned int)base_cpu)

			continue;



		/* Get CPU vendor */

tools/power/cpupower/utils/helpers/helpers.h

+3 −2
Original line number Diff line number Diff line
@@ -34,6 +34,7 @@ 
/* Internationalization ****************************/



extern int run_as_root;

extern int base_cpu;

extern struct bitmask *cpus_chosen;



/* Global verbose (-d) stuff *********************************/
@@ -87,11 +88,11 @@ struct cpupower_cpu_info { 
 *

 * Extract CPU vendor, family, model, stepping info from /proc/cpuinfo

 *

 * Returns 0 on success or a negativ error code

 * Returns 0 on success or a negative error code

 * Only used on x86, below global's struct values are zero/unknown on

 * other archs

 */

extern int get_cpu_info(unsigned int cpu, struct cpupower_cpu_info *cpu_info);

extern int get_cpu_info(struct cpupower_cpu_info *cpu_info);

extern struct cpupower_cpu_info cpupower_cpu_info;

/* cpuid and cpuinfo helpers  **************************/

tools/power/cpupower/utils/helpers/misc.c

+1 −1
Original line number Diff line number Diff line
@@ -13,7 +13,7 @@ int cpufreq_has_boost_support(unsigned int cpu, int *support, int *active, 


	*support = *active = *states = 0;



	ret = get_cpu_info(0, &cpu_info);

	ret = get_cpu_info(&cpu_info);

	if (ret)

		return ret;

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

+2 −2
Original line number Diff line number Diff line
@@ -123,7 +123,7 @@ static int hsw_ext_start(void) 
			previous_count[num][cpu] = val;

		}

	}

	hsw_ext_get_count(TSC, &tsc_at_measure_start, 0);

	hsw_ext_get_count(TSC, &tsc_at_measure_start, base_cpu);

	return 0;

}
@@ -132,7 +132,7 @@ static int hsw_ext_stop(void) 
	unsigned long long val;

	int num, cpu;



	hsw_ext_get_count(TSC, &tsc_at_measure_end, 0);

	hsw_ext_get_count(TSC, &tsc_at_measure_end, base_cpu);



	for (num = 0; num < HSW_EXT_CSTATE_COUNT; num++) {

		for (cpu = 0; cpu < cpu_count; cpu++) {