From: Nathan Fontenot <nathan.fontenot@amd.com>
To: rrichter@amd.com, shuah@kernel.org, linux-kernel@vger.kernel.org,
trenn@suse.com, linux-pm@vger.kernel.org
Subject: [PATCH 5/8] cpupower: Update family checks when decoding HW pstates
Date: Fri, 22 Jan 2021 11:39:07 -0600 [thread overview]
Message-ID: <161133714713.59625.6299790565871909582.stgit@ethanol01c7-host.amd.com> (raw)
In-Reply-To: <161133705833.59625.6935511700675018185.stgit@ethanol01c7-host.amd.com>
The family checks in get_cof() and get_did() need to use the
correct MSR format depending on the family. Add a cpupower
capability for using the pstatedef (family 17h and newer) to
control this instead of direct family checks.
Signed-off-by: Nathan Fontenot <nathan.fontenot@amd.com>
---
tools/power/cpupower/utils/helpers/amd.c | 8 ++++----
tools/power/cpupower/utils/helpers/cpuid.c | 6 +++++-
tools/power/cpupower/utils/helpers/helpers.h | 1 +
3 files changed, 10 insertions(+), 5 deletions(-)
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
index bd4db2e9a8a0..519a21e92666 100644
--- a/tools/power/cpupower/utils/helpers/amd.c
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -45,10 +45,10 @@ static int get_did(int family, union core_pstate pstate)
{
int t;
- if (family == 0x12)
- t = pstate.val & 0xf;
- else if (family == 0x17 || family == 0x18)
+ if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATEDEF)
t = pstate.pstatedef.did;
+ else if (family == 0x12)
+ t = pstate.val & 0xf;
else
t = pstate.pstate.did;
@@ -61,7 +61,7 @@ static int get_cof(int family, union core_pstate pstate)
int fid, did, cof;
did = get_did(family, pstate);
- if (family == 0x17 || family == 0x18) {
+ if (cpupower_cpu_info.caps & CPUPOWER_CAP_AMD_PSTATEDEF) {
fid = pstate.pstatedef.fid;
cof = 200 * fid / did;
} else {
diff --git a/tools/power/cpupower/utils/helpers/cpuid.c b/tools/power/cpupower/utils/helpers/cpuid.c
index d577220a193b..db2e88ceb67b 100644
--- a/tools/power/cpupower/utils/helpers/cpuid.c
+++ b/tools/power/cpupower/utils/helpers/cpuid.c
@@ -133,9 +133,13 @@ int get_cpu_info(struct cpupower_cpu_info *cpu_info)
cpu_info->caps |= CPUPOWER_CAP_AMD_CPB;
if ((cpuid_edx(0x80000007) & (1 << 7)) &&
- cpu_info->family != 0x14)
+ cpu_info->family != 0x14) {
/* HW pstate was not implemented in family 0x14 */
cpu_info->caps |= CPUPOWER_CAP_AMD_HW_PSTATE;
+
+ if (cpu_info->family >= 0x17)
+ cpu_info->caps |= CPUPOWER_CAP_AMD_PSTATEDEF;
+ }
}
if (ext_cpuid_level >= 0x80000008 &&
diff --git a/tools/power/cpupower/utils/helpers/helpers.h b/tools/power/cpupower/utils/helpers/helpers.h
index 5f61eefff5b2..e4dc44ced770 100644
--- a/tools/power/cpupower/utils/helpers/helpers.h
+++ b/tools/power/cpupower/utils/helpers/helpers.h
@@ -71,6 +71,7 @@ enum cpupower_cpu_vendor {X86_VENDOR_UNKNOWN = 0, X86_VENDOR_INTEL,
#define CPUPOWER_CAP_INTEL_IDA 0x00000040
#define CPUPOWER_CAP_AMD_RDPRU 0x00000080
#define CPUPOWER_CAP_AMD_HW_PSTATE 0x00000100
+#define CPUPOWER_CAP_AMD_PSTATEDEF 0x00000200
#define CPUPOWER_AMD_CPBDIS 0x02000000
next prev parent reply other threads:[~2021-01-22 17:46 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-22 17:38 [PATCH 0/8] cpupower: Updates and cleanup to support AMD Family 0x19 Nathan Fontenot
2021-01-22 17:38 ` [PATCH 1/8] cpupower: Update msr_pstate union struct naming Nathan Fontenot
2021-01-22 20:17 ` Shuah Khan
2021-01-22 17:38 ` [PATCH 2/8] cpupower: Correct macro name for CPB caps flag Nathan Fontenot
2021-01-22 17:38 ` [PATCH 3/8] cpupower: Add CPUPOWER_CAP_AMD_HW_PSTATE cpuid " Nathan Fontenot
2021-01-22 20:23 ` Shuah Khan
2021-01-22 17:38 ` [PATCH 4/8] cpupower: Remove unused pscur variable Nathan Fontenot
2021-01-22 17:39 ` Nathan Fontenot [this message]
2021-01-22 17:39 ` [PATCH 6/8] cpupower: Condense pstate enabled bit checks in decode_pstates() Nathan Fontenot
2021-01-22 17:39 ` [PATCH 7/8] cpupower: Remove family arg to decode_pstates() Nathan Fontenot
2021-01-22 17:39 ` [PATCH 8/8] cpupower: Add cpuid cap flag for MSR_AMD_HWCR support Nathan Fontenot
2021-01-22 19:46 ` [PATCH 0/8] cpupower: Updates and cleanup to support AMD Family 0x19 Robert Richter
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=161133714713.59625.6299790565871909582.stgit@ethanol01c7-host.amd.com \
--to=nathan.fontenot@amd.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rrichter@amd.com \
--cc=shuah@kernel.org \
--cc=trenn@suse.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).