| From: Matt Turner <mattst88@gmail.com> |
| Date: Tue, 13 Feb 2018 11:12:05 -0800 |
| Subject: x86: msr-index.h: Correct SNB_C1/C3_AUTO_UNDEMOTE defines |
| |
| commit a00072a24a9f5b88cfc56f2dec6afe8ce3874e60 upstream. |
| |
| According to the Intel Software Developers' Manual, Vol. 4, Order No. |
| 335592, these macros have been reversed since they were added in the |
| initial turbostat commit. The reversed definitions were presumably |
| copied from turbostat.c to this file. |
| |
| Fixes: 9c63a650bb10 ("tools/power/x86/turbostat: share kernel MSR #defines") |
| Signed-off-by: Matt Turner <mattst88@gmail.com> |
| Acked-by: Ingo Molnar <mingo@kernel.org> |
| Signed-off-by: Len Brown <len.brown@intel.com> |
| [bwh: Backported to 3.16: adjust filename] |
| Signed-off-by: Ben Hutchings <ben@decadent.org.uk> |
| --- |
| arch/x86/include/uapi/asm/msr-index.h | 4 ++-- |
| 1 file changed, 2 insertions(+), 2 deletions(-) |
| |
| --- a/arch/x86/include/uapi/asm/msr-index.h |
| +++ b/arch/x86/include/uapi/asm/msr-index.h |
| @@ -50,8 +50,8 @@ |
| #define NHM_C3_AUTO_DEMOTE (1UL << 25) |
| #define NHM_C1_AUTO_DEMOTE (1UL << 26) |
| #define ATM_LNC_C6_AUTO_DEMOTE (1UL << 25) |
| -#define SNB_C1_AUTO_UNDEMOTE (1UL << 27) |
| -#define SNB_C3_AUTO_UNDEMOTE (1UL << 28) |
| +#define SNB_C3_AUTO_UNDEMOTE (1UL << 27) |
| +#define SNB_C1_AUTO_UNDEMOTE (1UL << 28) |
| |
| #define MSR_PLATFORM_INFO 0x000000ce |
| #define MSR_MTRRcap 0x000000fe |