From: Liran Alon <liran.alon@oracle.com>
To: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Cc: linux-pm@vger.kernel.org, lenb@kernel.org, rjw@rjwysocki.net,
viresh.kumar@linaro.org,
Boris Ostrovsky <boris.ostrovsky@oracle.com>
Subject: Re: [PATCH 2/2] x86: intel: Define MSR_POWER_CTL bits with symbolic constants
Date: Mon, 15 Apr 2019 11:35:40 +0300 [thread overview]
Message-ID: <116A1F36-A298-4F43-A1C2-1FC4AB75C731@oracle.com> (raw)
In-Reply-To: <1831fa285e2b73cd8dd7583efe2f073c7277ed2a.camel@linux.intel.com>
> On 15 Apr 2019, at 5:10, Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com> wrote:
>
> On Sun, 2019-04-14 at 23:48 +0300, Liran Alon wrote:
>> Reviewed-by: Boris Ostrovsky <boris.ostrovsky@oracle.com>
>> Signed-off-by: Liran Alon <liran.alon@oracle.com>
>> ---
>> arch/x86/include/asm/msr-index.h | 7 +++++++
>> drivers/cpufreq/intel_pstate.c | 6 ++----
>> drivers/idle/intel_idle.c | 2 +-
>> tools/power/x86/turbostat/turbostat.c | 2 +-
>> 4 files changed, 11 insertions(+), 6 deletions(-)
>>
>> diff --git a/arch/x86/include/asm/msr-index.h
>> b/arch/x86/include/asm/msr-index.h
>> index 8e40c2446fd1..436f3c5aa358 100644
>> --- a/arch/x86/include/asm/msr-index.h
>> +++ b/arch/x86/include/asm/msr-index.h
>> @@ -209,6 +209,13 @@
>>
>> #define MSR_IA32_POWER_CTL 0x000001fc
>>
>> +/* POWERCTLMSR bits: */
>> +#define POWERCTLMSR_BI_DIR_PROCHOT BIT(0) /* Bi-directional
>> PROCHOT */
>> +#define POWERCTLMSR_C1E_ENABLE BIT(1) /* C1E Enable
>> */
>> +#define POWERCTLMSR_EN_ENERGY_PERF_BIAS BIT(18) /* Enable
>> MSR_IA32_ENERGY_PERF_BIAS */
>> +#define POWERCTLMSR_DISABLE_RACE_TO_HLT BIT(19) /* Disable
>> Race to Halt Optimization */
>> +#define POWERCTLMSR_DISABLE_EE BIT(20) /* Disable
>> Energy Efficiency Optimization */
>> +
>> #define MSR_IA32_MC0_CTL 0x00000400
>> #define MSR_IA32_MC0_STATUS 0x00000401
>> #define MSR_IA32_MC0_ADDR 0x00000402
>> diff --git a/drivers/cpufreq/intel_pstate.c
>> b/drivers/cpufreq/intel_pstate.c
>> index 3ce39c332c7b..b42ba4456f66 100644
>> --- a/drivers/cpufreq/intel_pstate.c
>> +++ b/drivers/cpufreq/intel_pstate.c
>> @@ -1200,8 +1200,6 @@ static void intel_pstate_hwp_enable(struct
>> cpudata *cpudata)
>> cpudata->epp_default = intel_pstate_get_epp(cpudata,
>> 0);
>> }
>>
>> -#define MSR_IA32_POWER_CTL_BIT_EE 20
>> -
>> /* Disable energy efficiency optimization */
>> static void intel_pstate_disable_ee(int cpu)
>> {
>> @@ -1212,9 +1210,9 @@ static void intel_pstate_disable_ee(int cpu)
>> if (ret)
>> return;
>>
>> - if (!(power_ctl & BIT(MSR_IA32_POWER_CTL_BIT_EE))) {
>> + if (!(power_ctl & POWERCTLMSR_DISABLE_EE)) {
>> pr_info("Disabling energy efficiency optimization\n");
>> - power_ctl |= BIT(MSR_IA32_POWER_CTL_BIT_EE);
>> + power_ctl |= POWERCTLMSR_DISABLE_EE;
> To match SDM defintion
> power_ctl |= POWERCTLMSR_DISABLE_RACE_TO_HLT;
> To set BIT 20, we need some data why this is necessary. If you really
> need performance set eneregy_perf_preference to performance.
>
> Thanks,
> Srinivas
This patch is solely a refactoring patch. It doesn’t intend to change semantics.
Based on our discussion on previous patch, it seems we are just misaligned on the meaning of the various MSR_POWER_CTL bits.
-Liran
>
>> wrmsrl_on_cpu(cpu, MSR_IA32_POWER_CTL, power_ctl);
>> }
>> }
>> diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
>> index 8b5d85c91e9d..3654575e6697 100644
>> --- a/drivers/idle/intel_idle.c
>> +++ b/drivers/idle/intel_idle.c
>> @@ -977,7 +977,7 @@ static void c1e_promotion_disable(void)
>> unsigned long long msr_bits;
>>
>> rdmsrl(MSR_IA32_POWER_CTL, msr_bits);
>> - msr_bits &= ~0x2;
>> + msr_bits &= ~POWERCTLMSR_C1E_ENABLE;
>> wrmsrl(MSR_IA32_POWER_CTL, msr_bits);
>> }
>>
>> diff --git a/tools/power/x86/turbostat/turbostat.c
>> b/tools/power/x86/turbostat/turbostat.c
>> index 9327c0ddc3a5..0455aa7e9c6f 100644
>> --- a/tools/power/x86/turbostat/turbostat.c
>> +++ b/tools/power/x86/turbostat/turbostat.c
>> @@ -2019,7 +2019,7 @@ dump_nhm_platform_info(void)
>>
>> get_msr(base_cpu, MSR_IA32_POWER_CTL, &msr);
>> fprintf(outf, "cpu%d: MSR_IA32_POWER_CTL: 0x%08llx (C1E auto-
>> promotion: %sabled)\n",
>> - base_cpu, msr, msr & 0x2 ? "EN" : "DIS");
>> + base_cpu, msr, msr & POWERCTLMSR_C1E_ENABLE ? "EN" :
>> "DIS");
>>
>> return;
>> }
>
next prev parent reply other threads:[~2019-04-15 8:37 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2019-04-14 20:48 [PATCH 1/2] x86: intel_pstate: Fix wrong definition of Disable Energy Efficiency Optimization bit Liran Alon
2019-04-14 20:48 ` [PATCH 2/2] x86: intel: Define MSR_POWER_CTL bits with symbolic constants Liran Alon
2019-04-15 2:10 ` Srinivas Pandruvada
2019-04-15 8:35 ` Liran Alon [this message]
2019-04-15 2:00 ` [PATCH 1/2] x86: intel_pstate: Fix wrong definition of Disable Energy Efficiency Optimization bit Srinivas Pandruvada
2019-04-15 8:32 ` Liran Alon
2019-04-15 18:03 ` Srinivas Pandruvada
2019-04-15 18:13 ` Liran Alon
2019-04-15 18:22 ` Srinivas Pandruvada
2019-04-15 18:27 ` Liran Alon
2019-04-15 18:30 ` Srinivas Pandruvada
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=116A1F36-A298-4F43-A1C2-1FC4AB75C731@oracle.com \
--to=liran.alon@oracle.com \
--cc=boris.ostrovsky@oracle.com \
--cc=lenb@kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=rjw@rjwysocki.net \
--cc=srinivas.pandruvada@linux.intel.com \
--cc=viresh.kumar@linaro.org \
/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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.