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
Cc: boris.ostrovsky@oracle.com, joao.m.martins@oracle.com,
konrad.wilk@oracle.com
Subject: [PATCH v2 4/8] cpupower: Remove unused pscur variable.
Date: Mon, 25 Jan 2021 11:35:10 -0600 [thread overview]
Message-ID: <161159611089.68367.4122824171734411902.stgit@ethanol01c7-host.amd.com> (raw)
In-Reply-To: <161159600371.68367.14890273216040482793.stgit@ethanol01c7-host.amd.com>
The pscur variable is set but not uused, just remove it.
This may have previsously been set to validate the MSR_AMD_PSTATE_STATUS
MSR. With the addition of the CPUPOWER_CAP_AMD_HW_PSTATE cap flag this
is no longer needed since the cpuid bit to enable this cap flag also
validates that the MSR_AMD_PSTATE_STATUS MSR is present.
Signed-off-by: Nathan Fontenot <nathan.fontenot@amd.com>
---
tools/power/cpupower/utils/helpers/amd.c | 9 +--------
1 file changed, 1 insertion(+), 8 deletions(-)
diff --git a/tools/power/cpupower/utils/helpers/amd.c b/tools/power/cpupower/utils/helpers/amd.c
index 8b69c7ff639a..fc2ac1e6bfb2 100644
--- a/tools/power/cpupower/utils/helpers/amd.c
+++ b/tools/power/cpupower/utils/helpers/amd.c
@@ -90,7 +90,7 @@ static int get_cof(int family, union core_pstate pstate)
int decode_pstates(unsigned int cpu, unsigned int cpu_family,
int boost_states, unsigned long *pstates, int *no)
{
- int i, psmax, pscur;
+ int i, psmax;
union core_pstate pstate;
unsigned long long val;
@@ -104,13 +104,6 @@ int decode_pstates(unsigned int cpu, unsigned int cpu_family,
return -1;
psmax = (val >> 4) & 0x7;
-
- if (read_msr(cpu, MSR_AMD_PSTATE_STATUS, &val))
- return -1;
-
- pscur = val & 0x7;
-
- pscur += boost_states;
psmax += boost_states;
for (i = 0; i <= psmax; i++) {
if (i >= MAX_HW_PSTATES) {
next prev parent reply other threads:[~2021-01-25 17:45 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-01-25 17:34 [PATCH v2 0/8] cpupower: Updates and cleanup to support AMD Family 0x19 Nathan Fontenot
2021-01-25 17:34 ` [PATCH v2 1/8] cpupower: Update msr_pstate union struct naming Nathan Fontenot
2021-01-25 17:34 ` [PATCH v2 2/8] cpupower: Correct macro name for CPB caps flag Nathan Fontenot
2021-01-25 17:34 ` [PATCH v2 3/8] cpupower: Add CPUPOWER_CAP_AMD_HW_PSTATE cpuid " Nathan Fontenot
2021-01-25 17:35 ` Nathan Fontenot [this message]
2021-01-25 17:35 ` [PATCH v2 5/8] cpupower: Update family checks when decoding HW pstates Nathan Fontenot
2021-01-25 17:35 ` [PATCH v2 6/8] cpupower: Condense pstate enabled bit checks in decode_pstates() Nathan Fontenot
2021-01-25 17:36 ` [PATCH v2 7/8] cpupower: Remove family arg to decode_pstates() Nathan Fontenot
2021-01-25 17:36 ` [PATCH v2 8/8] cpupower: Add cpuid cap flag for MSR_AMD_HWCR support Nathan Fontenot
2021-01-26 16:45 ` [PATCH v2 0/8] cpupower: Updates and cleanup to support AMD Family 0x19 Shuah Khan
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=161159611089.68367.4122824171734411902.stgit@ethanol01c7-host.amd.com \
--to=nathan.fontenot@amd.com \
--cc=boris.ostrovsky@oracle.com \
--cc=joao.m.martins@oracle.com \
--cc=konrad.wilk@oracle.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).