diff options
| author | Pu Wen <puwen@hygon.cn> | 2019-08-31 10:19:58 +0800 |
|---|---|---|
| committer | Len Brown <len.brown@intel.com> | 2019-08-31 14:48:39 -0400 |
| commit | 9cfa8e042f7cbb1994cc5923e46c78b36f6054f4 (patch) | |
| tree | 66ad0ca2cc17e50a16eef549587099fd6830c3f0 /tools/power/x86/turbostat | |
| parent | 1e9042b9c8d46ada9ee7b3339a31f50d12e5d291 (diff) | |
| download | linux-9cfa8e042f7cbb1994cc5923e46c78b36f6054f4.tar.gz linux-9cfa8e042f7cbb1994cc5923e46c78b36f6054f4.tar.bz2 linux-9cfa8e042f7cbb1994cc5923e46c78b36f6054f4.zip | |
tools/power turbostat: Fix caller parameter of get_tdp_amd()
Commit 9392bd98bba760be96ee ("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>
Diffstat (limited to 'tools/power/x86/turbostat')
| -rw-r--r-- | tools/power/x86/turbostat/turbostat.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c index f57c4023231e..6cec6aa01241 100644 --- a/tools/power/x86/turbostat/turbostat.c +++ b/tools/power/x86/turbostat/turbostat.c @@ -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) |