2016-03-26 18:47:10

by Vladimir Zapolskiy

Subject: [PATCH] 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 <[email protected]>
---
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

2016-03-28 20:02:07

by srinivas pandruvada

Subject: Re: [PATCH] x86: cpufreq: remove duplicated TDP MSR macro definitions

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 <[email protected]>
 Reviewed-by: Srinivas Pandruvada <[email protected]>

> ---
>  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

2016-03-29 09:16:04

by tip-bot for Vasyl Gomonovych

Subject: [tip:x86/urgent] x86/cpufreq: Remove duplicated TDP MSR macro definitions

Commit-ID: 4a6772f514891eaacf26bcb7c2c808c557d23c6f
Gitweb: http://git.kernel.org/tip/4a6772f514891eaacf26bcb7c2c808c557d23c6f
Author: Vladimir Zapolskiy <[email protected]>
AuthorDate: Sat, 26 Mar 2016 20:47:00 +0200
Committer: Thomas Gleixner <[email protected]>
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 <[email protected]>
Cc: Len Brown <[email protected]>
Cc: "Rafael J. Wysocki" <[email protected]>
Cc: Kristen Carlson
Accardi <[email protected]>
Cc: Srinivas Pandruvada <[email protected]>
Link: http://lkml.kernel.org/r/[email protected]
Signed-off-by: Thomas Gleixner <[email protected]>

---
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