* [PATCH 1/3] cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
2016-07-06 23:07 [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Srinivas Pandruvada
@ 2016-07-06 23:07 ` Srinivas Pandruvada
2016-07-06 23:07 ` [PATCH 2/3] tools/power turbostat: " Srinivas Pandruvada
` (2 subsequent siblings)
3 siblings, 0 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2016-07-06 23:07 UTC (permalink / raw)
To: rjw, tglx, mingo, bp; +Cc: x86, linux-pm, linux-kernel, Srinivas Pandruvada
Replace MSR_NHM_TURBO_RATIO_LIMIT with MSR_TURBO_RATIO_LIMIT.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
drivers/cpufreq/intel_pstate.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/drivers/cpufreq/intel_pstate.c b/drivers/cpufreq/intel_pstate.c
index f6dd072..facf05c 100644
--- a/drivers/cpufreq/intel_pstate.c
+++ b/drivers/cpufreq/intel_pstate.c
@@ -973,7 +973,7 @@ static int core_get_turbo_pstate(void)
u64 value;
int nont, ret;
- rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
+ rdmsrl(MSR_TURBO_RATIO_LIMIT, value);
nont = core_get_max_pstate();
ret = (value) & 255;
if (ret <= nont)
@@ -1002,7 +1002,7 @@ static int knl_get_turbo_pstate(void)
u64 value;
int nont, ret;
- rdmsrl(MSR_NHM_TURBO_RATIO_LIMIT, value);
+ rdmsrl(MSR_TURBO_RATIO_LIMIT, value);
nont = core_get_max_pstate();
ret = (((value) >> 8) & 0xFF);
if (ret <= nont)
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread* [PATCH 2/3] tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
2016-07-06 23:07 [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Srinivas Pandruvada
2016-07-06 23:07 ` [PATCH 1/3] cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT Srinivas Pandruvada
@ 2016-07-06 23:07 ` Srinivas Pandruvada
2016-07-06 23:07 ` [PATCH 3/3] x86: remove duplicate turbo ratio limit MSRs Srinivas Pandruvada
2016-07-06 23:21 ` [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Rafael J. Wysocki
3 siblings, 0 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2016-07-06 23:07 UTC (permalink / raw)
To: rjw, tglx, mingo, bp; +Cc: x86, linux-pm, linux-kernel, Srinivas Pandruvada
Replace MSR_NHM_TURBO_RATIO_LIMIT with MSR_TURBO_RATIO_LIMIT.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
tools/power/x86/turbostat/turbostat.8 | 2 +-
tools/power/x86/turbostat/turbostat.c | 2 +-
2 files changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/power/x86/turbostat/turbostat.8 b/tools/power/x86/turbostat/turbostat.8
index 89a55d5..492e84f 100644
--- a/tools/power/x86/turbostat/turbostat.8
+++ b/tools/power/x86/turbostat/turbostat.8
@@ -123,7 +123,7 @@ cpu0: MSR_NHM_PLATFORM_INFO: 0x80838f3012300
35 * 100 = 3500 MHz TSC frequency
cpu0: MSR_IA32_POWER_CTL: 0x0004005d (C1E auto-promotion: DISabled)
cpu0: MSR_NHM_SNB_PKG_CST_CFG_CTL: 0x1e000400 (UNdemote-C3, UNdemote-C1, demote-C3, demote-C1, UNlocked: pkg-cstate-limit=0: pc0)
-cpu0: MSR_NHM_TURBO_RATIO_LIMIT: 0x25262727
+cpu0: MSR_TURBO_RATIO_LIMIT: 0x25262727
37 * 100 = 3700 MHz max turbo 4 active cores
38 * 100 = 3800 MHz max turbo 3 active cores
39 * 100 = 3900 MHz max turbo 2 active cores
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index acbf7ff..3e199b5 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -1480,7 +1480,7 @@ dump_knl_turbo_ratio_limits(void)
unsigned int cores[buckets_no];
unsigned int ratio[buckets_no];
- get_msr(base_cpu, MSR_NHM_TURBO_RATIO_LIMIT, &msr);
+ get_msr(base_cpu, MSR_TURBO_RATIO_LIMIT, &msr);
fprintf(outf, "cpu%d: MSR_TURBO_RATIO_LIMIT: 0x%08llx\n",
base_cpu, msr);
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* [PATCH 3/3] x86: remove duplicate turbo ratio limit MSRs
2016-07-06 23:07 [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Srinivas Pandruvada
2016-07-06 23:07 ` [PATCH 1/3] cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT Srinivas Pandruvada
2016-07-06 23:07 ` [PATCH 2/3] tools/power turbostat: " Srinivas Pandruvada
@ 2016-07-06 23:07 ` Srinivas Pandruvada
2016-07-06 23:21 ` [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Rafael J. Wysocki
3 siblings, 0 replies; 6+ messages in thread
From: Srinivas Pandruvada @ 2016-07-06 23:07 UTC (permalink / raw)
To: rjw, tglx, mingo, bp; +Cc: x86, linux-pm, linux-kernel, Srinivas Pandruvada
Remove MSR_NHM_TURBO_RATIO_LIMIT and MSR_IVT_TURBO_RATIO_LIMIT as
they are duplicate.
Signed-off-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
---
arch/x86/include/asm/msr-index.h | 2 --
1 file changed, 2 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 5a73a9c..56f4c66 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -64,8 +64,6 @@
#define MSR_OFFCORE_RSP_0 0x000001a6
#define MSR_OFFCORE_RSP_1 0x000001a7
-#define MSR_NHM_TURBO_RATIO_LIMIT 0x000001ad
-#define MSR_IVT_TURBO_RATIO_LIMIT 0x000001ae
#define MSR_TURBO_RATIO_LIMIT 0x000001ad
#define MSR_TURBO_RATIO_LIMIT1 0x000001ae
#define MSR_TURBO_RATIO_LIMIT2 0x000001af
--
2.5.5
^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs
2016-07-06 23:07 [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Srinivas Pandruvada
` (2 preceding siblings ...)
2016-07-06 23:07 ` [PATCH 3/3] x86: remove duplicate turbo ratio limit MSRs Srinivas Pandruvada
@ 2016-07-06 23:21 ` Rafael J. Wysocki
2016-07-07 7:37 ` Thomas Gleixner
3 siblings, 1 reply; 6+ messages in thread
From: Rafael J. Wysocki @ 2016-07-06 23:21 UTC (permalink / raw)
To: Srinivas Pandruvada, Thomas Gleixner, Ingo Molnar
Cc: Rafael J. Wysocki, Borislav Petkov, the arch/x86 maintainers,
Linux PM, Linux Kernel Mailing List
On Thu, Jul 7, 2016 at 1:07 AM, Srinivas Pandruvada
<srinivas.pandruvada@linux.intel.com> wrote:
> MSR_NHM_TURBO_RATIO_LIMIT and MSR_IVT_TURBO_RATIO_LIMIT are
> duplicate MSRs with MSR_TURBO_RATIO_LIMIT and MSR_TURBO_RATIO_LIMIT1
> respectively. So remove them by first removing their usage and then
> from msr-index.h.
>
> Srinivas Pandruvada (3):
> cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
> tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
> x86: remove duplicate turbo ratio limit MSRs
>
> arch/x86/include/asm/msr-index.h | 2 --
> drivers/cpufreq/intel_pstate.c | 4 ++--
> tools/power/x86/turbostat/turbostat.8 | 2 +-
> tools/power/x86/turbostat/turbostat.c | 2 +-
> 4 files changed, 4 insertions(+), 6 deletions(-)
The series looks good to me.
If anyone has any objections against this going in through the PM
tree, please let me know.
Thanks,
Rafael
^ permalink raw reply [flat|nested] 6+ messages in thread* Re: [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs
2016-07-06 23:21 ` [PATCH 0/3] x86: Remove duplicate turbo ratio MSRs Rafael J. Wysocki
@ 2016-07-07 7:37 ` Thomas Gleixner
0 siblings, 0 replies; 6+ messages in thread
From: Thomas Gleixner @ 2016-07-07 7:37 UTC (permalink / raw)
To: Rafael J. Wysocki
Cc: Srinivas Pandruvada, Ingo Molnar, Rafael J. Wysocki,
Borislav Petkov, the arch/x86 maintainers, Linux PM,
Linux Kernel Mailing List
On Thu, 7 Jul 2016, Rafael J. Wysocki wrote:
> On Thu, Jul 7, 2016 at 1:07 AM, Srinivas Pandruvada
> <srinivas.pandruvada@linux.intel.com> wrote:
> > MSR_NHM_TURBO_RATIO_LIMIT and MSR_IVT_TURBO_RATIO_LIMIT are
> > duplicate MSRs with MSR_TURBO_RATIO_LIMIT and MSR_TURBO_RATIO_LIMIT1
> > respectively. So remove them by first removing their usage and then
> > from msr-index.h.
> >
> > Srinivas Pandruvada (3):
> > cpufreq: intel_pstate: Replace MSR_NHM_TURBO_RATIO_LIMIT
> > tools/power turbostat: Replace MSR_NHM_TURBO_RATIO_LIMIT
> > x86: remove duplicate turbo ratio limit MSRs
> >
> > arch/x86/include/asm/msr-index.h | 2 --
> > drivers/cpufreq/intel_pstate.c | 4 ++--
> > tools/power/x86/turbostat/turbostat.8 | 2 +-
> > tools/power/x86/turbostat/turbostat.c | 2 +-
> > 4 files changed, 4 insertions(+), 6 deletions(-)
>
> The series looks good to me.
>
> If anyone has any objections against this going in through the PM
> tree, please let me know.
Acked-by: Thomas Gleixner <tglx@linutronix.de>
^ permalink raw reply [flat|nested] 6+ messages in thread