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

Merge tag 'linux-cpupower-4.20-rc1' of... 

Merge tag 'linux-cpupower-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux into pm-tools

Pull cpupower utility changes for 4.20 from Shuah Khan:

"This cpupower update consists of fixes for bugs and compile warnings
 from Prarit Bhargava and Anders Roxell."

* tag 'linux-cpupower-4.20-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux:
  cpupower: Fix coredump on VMWare
  cpupower: Fix AMD Family 0x17 msr_pstate size
  cpupower: remove stringop-truncation waring
parents 18d3f8fc f69ffc5d

tools/power/cpupower/bench/parse.c

+1 −1
Original line number Diff line number Diff line
@@ -145,7 +145,7 @@ struct config *prepare_default_config() 
	config->cpu = 0;

	config->prio = SCHED_HIGH;

	config->verbose = 0;

	strncpy(config->governor, "ondemand", 8);

	strncpy(config->governor, "ondemand", sizeof(config->governor));



	config->output = stdout;

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

+2 −0
Original line number Diff line number Diff line
@@ -200,6 +200,8 @@ static int get_boost_mode(unsigned int cpu) 
		printf(_("    Boost States: %d\n"), b_states);

		printf(_("    Total States: %d\n"), pstate_no);

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

			if (!pstates[i])

				continue;

			if (i < b_states)

				printf(_("    Pstate-Pb%d: %luMHz (boost state)"

					 "\n"), i, pstates[i]);

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

+6 −1
Original line number Diff line number Diff line
@@ -33,7 +33,7 @@ union msr_pstate { 
		unsigned vid:8;

		unsigned iddval:8;

		unsigned idddiv:2;

		unsigned res1:30;

		unsigned res1:31;

		unsigned en:1;

	} fam17h_bits;

	unsigned long long val;
@@ -119,6 +119,11 @@ int decode_pstates(unsigned int cpu, unsigned int cpu_family, 
		}

		if (read_msr(cpu, MSR_AMD_PSTATE + i, &pstate.val))

			return -1;

		if ((cpu_family == 0x17) && (!pstate.fam17h_bits.en))

			continue;

		else if (!pstate.bits.en)

			continue;



		pstates[i] = get_cof(cpu_family, pstate);

	}

	*no = i;