* [PATCH] x86: cpufreq: remove duplicated TDP MSR macro definitions
@ 2016-03-26 18:47 Vladimir Zapolskiy
2016-03-28 20:02 ` Srinivas Pandruvada
2016-03-29 9:15 ` [tip:x86/urgent] x86/cpufreq: Remove " tip-bot for Vladimir Zapolskiy
0 siblings, 2 replies; 3+ messages in thread
From: Vladimir Zapolskiy @ 2016-03-26 18:47 UTC (permalink / raw)
To: Rafael J. Wysocki, Len Brown
Cc: Srinivas Pandruvada, Kristen Carlson Accardi, Thomas Gleixner,
x86, linux-kernel
The list of CPU model specific registers contains two copies of TDP
registers, remove the one, which is out of numerical order in the
list.
Fixes: 6a35fc2d6c22 ("cpufreq: intel_pstate: get P1 from TAR when available")
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
---
arch/x86/include/asm/msr-index.h | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 2da46ac..426e946 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -190,6 +190,7 @@
#define MSR_PP1_ENERGY_STATUS 0x00000641
#define MSR_PP1_POLICY 0x00000642
+/* Config TDP MSRs */
#define MSR_CONFIG_TDP_NOMINAL 0x00000648
#define MSR_CONFIG_TDP_LEVEL_1 0x00000649
#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A
@@ -210,13 +211,6 @@
#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0
#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1
-/* Config TDP MSRs */
-#define MSR_CONFIG_TDP_NOMINAL 0x00000648
-#define MSR_CONFIG_TDP_LEVEL1 0x00000649
-#define MSR_CONFIG_TDP_LEVEL2 0x0000064A
-#define MSR_CONFIG_TDP_CONTROL 0x0000064B
-#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C
-
/* Hardware P state interface */
#define MSR_PPERF 0x0000064e
#define MSR_PERF_LIMIT_REASONS 0x0000064f
--
2.5.0
^ permalink raw reply related [flat|nested] 3+ messages in thread
* Re: [PATCH] x86: cpufreq: remove duplicated TDP MSR macro definitions
2016-03-26 18:47 [PATCH] x86: cpufreq: remove duplicated TDP MSR macro definitions Vladimir Zapolskiy
@ 2016-03-28 20:02 ` Srinivas Pandruvada
2016-03-29 9:15 ` [tip:x86/urgent] x86/cpufreq: Remove " tip-bot for Vladimir Zapolskiy
1 sibling, 0 replies; 3+ messages in thread
From: Srinivas Pandruvada @ 2016-03-28 20:02 UTC (permalink / raw)
To: Vladimir Zapolskiy, Rafael J. Wysocki, Len Brown
Cc: Kristen Carlson Accardi, Thomas Gleixner, x86, linux-kernel
On Sat, 2016-03-26 at 20:47 +0200, Vladimir Zapolskiy wrote:
> The list of CPU model specific registers contains two copies of TDP
> registers, remove the one, which is out of numerical order in the
> list.
>
Thanks for finding this.
> Fixes: 6a35fc2d6c22 ("cpufreq: intel_pstate: get P1 from TAR when
> available")
> Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Reviewed-by: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
> ---
> arch/x86/include/asm/msr-index.h | 8 +-------
> 1 file changed, 1 insertion(+), 7 deletions(-)
>
> diff --git a/arch/x86/include/asm/msr-index.h
> b/arch/x86/include/asm/msr-index.h
> index 2da46ac..426e946 100644
> --- a/arch/x86/include/asm/msr-index.h
> +++ b/arch/x86/include/asm/msr-index.h
> @@ -190,6 +190,7 @@
> #define MSR_PP1_ENERGY_STATUS 0x00000641
> #define MSR_PP1_POLICY 0x00000642
>
> +/* Config TDP MSRs */
> #define MSR_CONFIG_TDP_NOMINAL 0x00000648
> #define MSR_CONFIG_TDP_LEVEL_1 0x00000649
> #define MSR_CONFIG_TDP_LEVEL_2 0x0000064A
> @@ -210,13 +211,6 @@
> #define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0
> #define MSR_RING_PERF_LIMIT_REASONS 0x000006B1
>
> -/* Config TDP MSRs */
> -#define MSR_CONFIG_TDP_NOMINAL 0x00000648
> -#define MSR_CONFIG_TDP_LEVEL1 0x00000649
> -#define MSR_CONFIG_TDP_LEVEL2 0x0000064A
> -#define MSR_CONFIG_TDP_CONTROL 0x0000064B
> -#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C
> -
> /* Hardware P state interface */
> #define MSR_PPERF 0x0000064e
> #define MSR_PERF_LIMIT_REASONS 0x0000064f
^ permalink raw reply [flat|nested] 3+ messages in thread
* [tip:x86/urgent] x86/cpufreq: Remove duplicated TDP MSR macro definitions
2016-03-26 18:47 [PATCH] x86: cpufreq: remove duplicated TDP MSR macro definitions Vladimir Zapolskiy
2016-03-28 20:02 ` Srinivas Pandruvada
@ 2016-03-29 9:15 ` tip-bot for Vladimir Zapolskiy
1 sibling, 0 replies; 3+ messages in thread
From: tip-bot for Vladimir Zapolskiy @ 2016-03-29 9:15 UTC (permalink / raw)
To: linux-tip-commits
Cc: tglx, linux-kernel, len.brown, srinivas.pandruvada,
rafael.j.wysocki, mingo, hpa, vladimir_zapolskiy
Commit-ID: 4a6772f514891eaacf26bcb7c2c808c557d23c6f
Gitweb: http://git.kernel.org/tip/4a6772f514891eaacf26bcb7c2c808c557d23c6f
Author: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
AuthorDate: Sat, 26 Mar 2016 20:47:00 +0200
Committer: Thomas Gleixner <tglx@linutronix.de>
CommitDate: Tue, 29 Mar 2016 11:12:10 +0200
x86/cpufreq: Remove duplicated TDP MSR macro definitions
The list of CPU model specific registers contains two copies of TDP
registers, remove the one, which is out of numerical order in the
list.
Fixes: 6a35fc2d6c22 ("cpufreq: intel_pstate: get P1 from TAR when available")
Signed-off-by: Vladimir Zapolskiy <vladimir_zapolskiy@mentor.com>
Cc: Len Brown <len.brown@intel.com>
Cc: "Rafael J. Wysocki" <rafael.j.wysocki@intel.com>
Cc: Kristen Carlson
Accardi <kristen@linux.intel.com>
Cc: Srinivas Pandruvada <srinivas.pandruvada@linux.intel.com>
Link: http://lkml.kernel.org/r/1459018020-24577-1-git-send-email-vladimir_zapolskiy@mentor.com
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
---
arch/x86/include/asm/msr-index.h | 8 +-------
1 file changed, 1 insertion(+), 7 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index 2da46ac..426e946 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -190,6 +190,7 @@
#define MSR_PP1_ENERGY_STATUS 0x00000641
#define MSR_PP1_POLICY 0x00000642
+/* Config TDP MSRs */
#define MSR_CONFIG_TDP_NOMINAL 0x00000648
#define MSR_CONFIG_TDP_LEVEL_1 0x00000649
#define MSR_CONFIG_TDP_LEVEL_2 0x0000064A
@@ -210,13 +211,6 @@
#define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0
#define MSR_RING_PERF_LIMIT_REASONS 0x000006B1
-/* Config TDP MSRs */
-#define MSR_CONFIG_TDP_NOMINAL 0x00000648
-#define MSR_CONFIG_TDP_LEVEL1 0x00000649
-#define MSR_CONFIG_TDP_LEVEL2 0x0000064A
-#define MSR_CONFIG_TDP_CONTROL 0x0000064B
-#define MSR_TURBO_ACTIVATION_RATIO 0x0000064C
-
/* Hardware P state interface */
#define MSR_PPERF 0x0000064e
#define MSR_PERF_LIMIT_REASONS 0x0000064f
^ permalink raw reply related [flat|nested] 3+ messages in thread
end of thread, other threads:[~2016-03-29 9:16 UTC | newest]
Thread overview: 3+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2016-03-26 18:47 [PATCH] x86: cpufreq: remove duplicated TDP MSR macro definitions Vladimir Zapolskiy
2016-03-28 20:02 ` Srinivas Pandruvada
2016-03-29 9:15 ` [tip:x86/urgent] x86/cpufreq: Remove " tip-bot for Vladimir Zapolskiy
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox