Commit 9cfa8e04 authored Aug 31, 2019 by Pu Wen Committed by Len Brown Aug 31, 2019

tools/power turbostat: Fix caller parameter of get_tdp_amd()



Commit 9392bd98 ("tools/power turbostat: Add support for AMD
Fam 17h (Zen) RAPL") add a function get_tdp_amd(), the parameter is CPU
family. But the rapl_probe_amd() function use wrong model parameter.
Fix the wrong caller parameter of get_tdp_amd() to use family.

Cc: <stable@vger.kernel.org> # v5.1+
Signed-off-by: Pu Wen <puwen@hygon.cn>
Reviewed-by: Calvin Walton <calvin.walton@kepstin.ca>
Signed-off-by: Len Brown <len.brown@intel.com>

parent 1e9042b9

tools/power/x86/turbostat/turbostat.c

+1 −1

Original line number	Diff line number	Diff line
		@@ -4031,7 +4031,7 @@ void rapl_probe_amd(unsigned int family, unsigned int model)
		rapl_energy_units = ldexp(1.0, -(msr >> 8 & 0x1f));
		rapl_power_units = ldexp(1.0, -(msr & 0xf));

		tdp = get_tdp_amd(model);
		tdp = get_tdp_amd(family);

		rapl_joule_counter_range = 0xFFFFFFFF * rapl_energy_units / tdp;
		if (!quiet)