* linux-next: manual merge of the idle tree with the pm tree
@ 2013-11-15 1:23 Stephen Rothwell
2013-11-15 15:22 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2013-11-15 1:23 UTC (permalink / raw)
To: Len Brown, Rafael J. Wysocki; +Cc: linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 537 bytes --]
Hi Len,
Today's linux-next merge of the idle tree got a conflict in
drivers/idle/intel_idle.c between commit fab04b2208dd ("intel_idle:
Support Intel Atom Processor C2000 Product Family") from the pm tree and
commit 0654c50d7a0b ("intel_idle: Support Intel Atom Processor C2000
Product Family") from the idle tree.
I fixed it up (I used the version from the pm tree since it was much
newer) and can carry the fix as necessary (no action is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the idle tree with the pm tree
2013-11-15 1:23 linux-next: manual merge of the idle tree with the pm tree Stephen Rothwell
@ 2013-11-15 15:22 ` Rafael J. Wysocki
0 siblings, 0 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2013-11-15 15:22 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Len Brown, linux-next, linux-kernel
[-- Attachment #1: Type: text/plain, Size: 574 bytes --]
On Friday, November 15, 2013 12:23:29 PM Stephen Rothwell wrote:
> Hi Len,
>
> Today's linux-next merge of the idle tree got a conflict in
> drivers/idle/intel_idle.c between commit fab04b2208dd ("intel_idle:
> Support Intel Atom Processor C2000 Product Family") from the pm tree and
> commit 0654c50d7a0b ("intel_idle: Support Intel Atom Processor C2000
> Product Family") from the idle tree.
>
> I fixed it up (I used the version from the pm tree since it was much
> newer) and can carry the fix as necessary (no action is required).
Thanks for fixing this up!
Rafael
[-- Attachment #2: This is a digitally signed message part. --]
[-- Type: application/pgp-signature, Size: 836 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: linux-next: manual merge of the idle tree with the pm tree
2015-04-14 2:47 Stephen Rothwell
@ 2015-04-14 11:54 ` Rafael J. Wysocki
0 siblings, 0 replies; 5+ messages in thread
From: Rafael J. Wysocki @ 2015-04-14 11:54 UTC (permalink / raw)
To: Stephen Rothwell; +Cc: Len Brown, linux-next, linux-kernel, Andrey Semin
On Tuesday, April 14, 2015 12:47:09 PM Stephen Rothwell wrote:
>
> --Sig_/R75yz7NvQ/VA+OLEs7ruwVh
> Content-Type: text/plain; charset=US-ASCII
> Content-Transfer-Encoding: quoted-printable
>
> Hi Len,
>
> Today's linux-next merge of the idle tree got a conflict in
> tools/power/x86/turbostat/turbostat.c between commits from the pm tree
> and similar commits from the idle tree.
>
> There seem to be two differnet version of these patches, so I just
> dropped the idle tree for today, please sort this out.
I've dropped the turbostat material (which apparently has been rebased after
I pulled it) from my linux-next branch.
Rafael
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the idle tree with the pm tree
@ 2015-04-14 2:47 Stephen Rothwell
2015-04-14 11:54 ` Rafael J. Wysocki
0 siblings, 1 reply; 5+ messages in thread
From: Stephen Rothwell @ 2015-04-14 2:47 UTC (permalink / raw)
To: Len Brown, Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Andrey Semin
[-- Attachment #1: Type: text/plain, Size: 385 bytes --]
Hi Len,
Today's linux-next merge of the idle tree got a conflict in
tools/power/x86/turbostat/turbostat.c between commits from the pm tree
and similar commits from the idle tree.
There seem to be two differnet version of these patches, so I just
dropped the idle tree for today, please sort this out.
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* linux-next: manual merge of the idle tree with the pm tree
@ 2014-11-17 1:54 Stephen Rothwell
0 siblings, 0 replies; 5+ messages in thread
From: Stephen Rothwell @ 2014-11-17 1:54 UTC (permalink / raw)
To: Len Brown, Rafael J. Wysocki; +Cc: linux-next, linux-kernel, Dirk Brandewie
[-- Attachment #1: Type: text/plain, Size: 2562 bytes --]
Hi Len,
Today's linux-next merge of the idle tree got a conflict in
arch/x86/include/uapi/asm/msr-index.h between commit 2f86dc4cddcb
("intel_pstate: Add support for HWP") from the pm tree and commit
a8b65b07d753 ("tools/power turbostat: decode MSR_*_PERF_LIMIT_REASONS")
from the idle tree.
I fixed it up (see below) and can carry the fix as necessary (no action
is required).
--
Cheers,
Stephen Rothwell sfr@canb.auug.org.au
diff --cc arch/x86/include/uapi/asm/msr-index.h
index 62838e54947d,c1cb18be540e..000000000000
--- a/arch/x86/include/uapi/asm/msr-index.h
+++ b/arch/x86/include/uapi/asm/msr-index.h
@@@ -149,48 -149,10 +149,52 @@@
#define MSR_CORE_C1_RES 0x00000660
+#define MSR_CC6_DEMOTION_POLICY_CONFIG 0x00000668
+#define MSR_MC6_DEMOTION_POLICY_CONFIG 0x00000669
+
+/* Hardware P state interface */
+#define MSR_PPERF 0x0000064e
+#define MSR_PERF_LIMIT_REASONS 0x0000064f
+#define MSR_PM_ENABLE 0x00000770
+#define MSR_HWP_CAPABILITIES 0x00000771
+#define MSR_HWP_REQUEST_PKG 0x00000772
+#define MSR_HWP_INTERRUPT 0x00000773
+#define MSR_HWP_REQUEST 0x00000774
+#define MSR_HWP_STATUS 0x00000777
+
+/* CPUID.6.EAX */
+#define HWP_BASE_BIT (1<<7)
+#define HWP_NOTIFICATIONS_BIT (1<<8)
+#define HWP_ACTIVITY_WINDOW_BIT (1<<9)
+#define HWP_ENERGY_PERF_PREFERENCE_BIT (1<<10)
+#define HWP_PACKAGE_LEVEL_REQUEST_BIT (1<<11)
+
+/* IA32_HWP_CAPABILITIES */
+#define HWP_HIGHEST_PERF(x) (x & 0xff)
+#define HWP_GUARANTEED_PERF(x) ((x & (0xff << 8)) >>8)
+#define HWP_MOSTEFFICIENT_PERF(x) ((x & (0xff << 16)) >>16)
+#define HWP_LOWEST_PERF(x) ((x & (0xff << 24)) >>24)
+
+/* IA32_HWP_REQUEST */
+#define HWP_MIN_PERF(x) (x & 0xff)
+#define HWP_MAX_PERF(x) ((x & 0xff) << 8)
+#define HWP_DESIRED_PERF(x) ((x & 0xff) << 16)
+#define HWP_ENERGY_PERF_PREFERENCE(x) ((x & 0xff) << 24)
+#define HWP_ACTIVITY_WINDOW(x) ((x & 0xff3) << 32)
+#define HWP_PACKAGE_CONTROL(x) ((x & 0x1) << 42)
+
+/* IA32_HWP_STATUS */
+#define HWP_GUARANTEED_CHANGE(x) (x & 0x1)
+#define HWP_EXCURSION_TO_MINIMUM(x) (x & 0x4)
+
+/* IA32_HWP_INTERRUPT */
+#define HWP_CHANGE_TO_GUARANTEED_INT(x) (x & 0x1)
+#define HWP_EXCURSION_TO_MINIMUM_INT(x) (x & 0x2)
+
+ #define MSR_CORE_PERF_LIMIT_REASONS 0x00000690
+ #define MSR_GFX_PERF_LIMIT_REASONS 0x000006B0
+ #define MSR_RING_PERF_LIMIT_REASONS 0x000006B1
+
#define MSR_AMD64_MC0_MASK 0xc0010044
#define MSR_IA32_MCx_CTL(x) (MSR_IA32_MC0_CTL + 4*(x))
[-- Attachment #2: OpenPGP digital signature --]
[-- Type: application/pgp-signature, Size: 819 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2015-04-14 11:30 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2013-11-15 1:23 linux-next: manual merge of the idle tree with the pm tree Stephen Rothwell
2013-11-15 15:22 ` Rafael J. Wysocki
2014-11-17 1:54 Stephen Rothwell
2015-04-14 2:47 Stephen Rothwell
2015-04-14 11:54 ` Rafael J. Wysocki
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).