mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-26 10:49:33 +00:00
tools/power turbostat: Support AMD Family 19h
Family 19h processors have the same RAPL (Running average power limit) hardware register interface as Family 17h processors. Change the family checks to succeed for Family 17h and above to enable core and package energy measurement on Family 19h machines. Also update the TDP to the largest found at the bottom of the page at amd.com->processors->servers->epyc->2nd-gen-epyc, i.e., the EPYC 7H12. Signed-off-by: Kim Phillips <kim.phillips@amd.com> Cc: Len Brown <len.brown@intel.com> Cc: Len Brown <lenb@kernel.org> Cc: linux-pm@vger.kernel.org Cc: linux-kernel@vger.kernel.org Signed-off-by: Len Brown <len.brown@intel.com>
This commit is contained in:
parent
20de0dab23
commit
33eb82251a
1 changed files with 11 additions and 23 deletions
|
@ -4162,13 +4162,8 @@ double get_tdp_intel(unsigned int model)
|
|||
|
||||
double get_tdp_amd(unsigned int family)
|
||||
{
|
||||
switch (family) {
|
||||
case 0x17:
|
||||
case 0x18:
|
||||
default:
|
||||
/* This is the max stock TDP of HEDT/Server Fam17h chips */
|
||||
return 250.0;
|
||||
}
|
||||
/* This is the max stock TDP of HEDT/Server Fam17h+ chips */
|
||||
return 280.0;
|
||||
}
|
||||
|
||||
/*
|
||||
|
@ -4358,27 +4353,20 @@ void rapl_probe_amd(unsigned int family, unsigned int model)
|
|||
|
||||
if (max_extended_level >= 0x80000007) {
|
||||
__cpuid(0x80000007, eax, ebx, ecx, edx);
|
||||
/* RAPL (Fam 17h) */
|
||||
/* RAPL (Fam 17h+) */
|
||||
has_rapl = edx & (1 << 14);
|
||||
}
|
||||
|
||||
if (!has_rapl)
|
||||
if (!has_rapl || family < 0x17)
|
||||
return;
|
||||
|
||||
switch (family) {
|
||||
case 0x17: /* Zen, Zen+ */
|
||||
case 0x18: /* Hygon Dhyana */
|
||||
do_rapl = RAPL_AMD_F17H | RAPL_PER_CORE_ENERGY;
|
||||
if (rapl_joules) {
|
||||
BIC_PRESENT(BIC_Pkg_J);
|
||||
BIC_PRESENT(BIC_Cor_J);
|
||||
} else {
|
||||
BIC_PRESENT(BIC_PkgWatt);
|
||||
BIC_PRESENT(BIC_CorWatt);
|
||||
}
|
||||
break;
|
||||
default:
|
||||
return;
|
||||
do_rapl = RAPL_AMD_F17H | RAPL_PER_CORE_ENERGY;
|
||||
if (rapl_joules) {
|
||||
BIC_PRESENT(BIC_Pkg_J);
|
||||
BIC_PRESENT(BIC_Cor_J);
|
||||
} else {
|
||||
BIC_PRESENT(BIC_PkgWatt);
|
||||
BIC_PRESENT(BIC_CorWatt);
|
||||
}
|
||||
|
||||
if (get_msr(base_cpu, MSR_RAPL_PWR_UNIT, &msr))
|
||||
|
|
Loading…
Reference in a new issue