* [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
@ 2018-02-13 19:12 Matt Turner
2018-02-13 19:12 ` [PATCH 2/2] x86: msr-index.h: " Matt Turner
2018-04-07 22:24 ` [PATCH 1/2] tools/power turbostat: " Matt Turner
0 siblings, 2 replies; 5+ messages in thread
From: Matt Turner @ 2018-02-13 19:12 UTC (permalink / raw)
To: Len Brown
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Borislav Petkov,
linux-kernel, x86, Matt Turner
According to the Intel Software Developers' Manual, Vol. 4, Order No.
335592, these macros have been reversed since they were added.
Fixes: 889facbee3e6 ("tools/power turbostat: v3.0: monitor Watts and Temperature")
Signed-off-by: Matt Turner <mattst88@gmail.com>
---
tools/power/x86/turbostat/turbostat.c | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/tools/power/x86/turbostat/turbostat.c b/tools/power/x86/turbostat/turbostat.c
index bd9c6b31a504..e55dc2e626c4 100644
--- a/tools/power/x86/turbostat/turbostat.c
+++ b/tools/power/x86/turbostat/turbostat.c
@@ -2071,8 +2071,8 @@ dump_nhm_cst_cfg(void)
get_msr(base_cpu, MSR_PKG_CST_CONFIG_CONTROL, &msr);
-#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)
fprintf(outf, "cpu%d: MSR_PKG_CST_CONFIG_CONTROL: 0x%08llx", base_cpu, msr);
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* [PATCH 2/2] x86: msr-index.h: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
2018-02-13 19:12 [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines Matt Turner
@ 2018-02-13 19:12 ` Matt Turner
2018-02-14 8:13 ` Ingo Molnar
2018-04-07 22:24 ` [PATCH 1/2] tools/power turbostat: " Matt Turner
1 sibling, 1 reply; 5+ messages in thread
From: Matt Turner @ 2018-02-13 19:12 UTC (permalink / raw)
To: Len Brown
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Borislav Petkov,
linux-kernel, x86, Matt Turner
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>
---
arch/x86/include/asm/msr-index.h | 4 ++--
1 file changed, 2 insertions(+), 2 deletions(-)
diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
index c9084dedfcfa..5c6aa44568c4 100644
--- a/arch/x86/include/asm/msr-index.h
+++ b/arch/x86/include/asm/msr-index.h
@@ -60,8 +60,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_MTRRcap 0x000000fe
--
2.13.6
^ permalink raw reply related [flat|nested] 5+ messages in thread
* Re: [PATCH 2/2] x86: msr-index.h: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
2018-02-13 19:12 ` [PATCH 2/2] x86: msr-index.h: " Matt Turner
@ 2018-02-14 8:13 ` Ingo Molnar
0 siblings, 0 replies; 5+ messages in thread
From: Ingo Molnar @ 2018-02-14 8:13 UTC (permalink / raw)
To: Matt Turner
Cc: Len Brown, Thomas Gleixner, Ingo Molnar, H. Peter Anvin,
Borislav Petkov, linux-kernel, x86
* Matt Turner <mattst88@gmail.com> wrote:
> 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>
Thanks,
Ingo
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
2018-02-13 19:12 [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines Matt Turner
2018-02-13 19:12 ` [PATCH 2/2] x86: msr-index.h: " Matt Turner
@ 2018-04-07 22:24 ` Matt Turner
2018-04-07 23:47 ` Brown, Len
1 sibling, 1 reply; 5+ messages in thread
From: Matt Turner @ 2018-04-07 22:24 UTC (permalink / raw)
To: Len Brown
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Borislav Petkov,
LKML, x86, Matt Turner
On Tue, Feb 13, 2018 at 11:12 AM, Matt Turner <mattst88@gmail.com> wrote:
> According to the Intel Software Developers' Manual, Vol. 4, Order No.
> 335592, these macros have been reversed since they were added.
>
> Fixes: 889facbee3e6 ("tools/power turbostat: v3.0: monitor Watts and Temperature")
> Signed-off-by: Matt Turner <mattst88@gmail.com>
Is there something I need to do to ensure these two trivial patches
get picked up?
^ permalink raw reply [flat|nested] 5+ messages in thread
* RE: [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
2018-04-07 22:24 ` [PATCH 1/2] tools/power turbostat: " Matt Turner
@ 2018-04-07 23:47 ` Brown, Len
0 siblings, 0 replies; 5+ messages in thread
From: Brown, Len @ 2018-04-07 23:47 UTC (permalink / raw)
To: Matt Turner
Cc: Thomas Gleixner, Ingo Molnar, H. Peter Anvin, Borislav Petkov, LKML, x86
You just did it:-)
-----Original Message-----
From: Matt Turner [mailto:mattst88@gmail.com]
Sent: Saturday, April 07, 2018 6:25 PM
To: Brown, Len <len.brown@intel.com>
Cc: Thomas Gleixner <tglx@linutronix.de>; Ingo Molnar <mingo@redhat.com>; H. Peter Anvin <hpa@zytor.com>; Borislav Petkov <bp@suse.de>; LKML <linux-kernel@vger.kernel.org>; x86@kernel.org; Matt Turner <mattst88@gmail.com>
Subject: Re: [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines
On Tue, Feb 13, 2018 at 11:12 AM, Matt Turner <mattst88@gmail.com> wrote:
> According to the Intel Software Developers' Manual, Vol. 4, Order No.
> 335592, these macros have been reversed since they were added.
>
> Fixes: 889facbee3e6 ("tools/power turbostat: v3.0: monitor Watts and
> Temperature")
> Signed-off-by: Matt Turner <mattst88@gmail.com>
Is there something I need to do to ensure these two trivial patches get picked up?
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2018-04-07 23:47 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2018-02-13 19:12 [PATCH 1/2] tools/power turbostat: Correct SNB_C1/C3_AUTO_UNDEMOTE defines Matt Turner
2018-02-13 19:12 ` [PATCH 2/2] x86: msr-index.h: " Matt Turner
2018-02-14 8:13 ` Ingo Molnar
2018-04-07 22:24 ` [PATCH 1/2] tools/power turbostat: " Matt Turner
2018-04-07 23:47 ` Brown, Len
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).