]> git.baikalelectronics.ru Git - kernel.git/commitdiff
tools/power turbostat: Fix caller parameter of get_tdp_amd()
authorPu Wen <puwen@hygon.cn>
Sat, 31 Aug 2019 02:19:58 +0000 (10:19 +0800)
committerLen Brown <len.brown@intel.com>
Sat, 31 Aug 2019 18:48:39 +0000 (14:48 -0400)
Commit feb13c04627bf6a1973b ("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>
tools/power/x86/turbostat/turbostat.c

index f57c4023231ee0e96c94c8490681f77494e2d176..6cec6aa012414b1c93cd43d81c2c81c7d238748d 100644 (file)
@@ -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)