From: Nathan Fontenot nathan.fontenot@amd.com
mainline inclusion from mainline-5.12-rc1-dontuse commit 56a85eebebdba62ebf6c46bd957949cc6e926aa0 category: feature bugzilla: https://gitee.com/openeuler/kernel/issues/I4QQWF
--------------------------------
The enabled bit (bit 63) is common for all families so we can remove the multiple enabled checks based on family and have a common check for HW pstate enabled.
Signed-off-by: Nathan Fontenot nathan.fontenot@amd.com Reviewed-by: Robert Richter rrichter@amd.com Signed-off-by: Shuah Khan skhan@linuxfoundation.org Signed-off-by: qinyu qinyu16@huawei.com Reviewed-by: Chao Liu liuchao173@huawei.com Reviewed-by: Xiongfeng Wang wangxiongfeng2@huawei.com Signed-off-by: Zheng Zengkai zhengzengkai@huawei.com --- tools/power/cpupower/utils/helpers/amd.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c index b4731daa6820..216240e2b771 100644 --- a/tools/power/cpupower/utils/helpers/amd.c +++ b/tools/power/cpupower/utils/helpers/amd.c @@ -113,9 +113,9 @@ 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.pstatedef.en)) - continue; - else if (!pstate.pstate.en) + + /* The enabled bit (bit 63) is common for all families */ + if (!pstate.pstatedef.en) continue;
pstates[i] = get_cof(cpu_family, pstate);