Attachment 621607 Details for Bug 834097 – RHEL6 patch 1/1

[patch] RHEL6 patch 1/1

diff (text/plain), 2.22 KB, created by Prarit Bhargava on 2012-10-04 12:20:55 UTC

(hide)

Description:

Filename:

MIME Type:

Creator: Prarit Bhargava

Created: 2012-10-04 12:20:55 UTC

Size: 2.22 KB

patch

obsolete

>[x86] Revert: intel_idle: disable NHM/WSM HW C-state auto-demotion
>
>diff --git a/arch/x86/include/asm/msr-index.h b/arch/x86/include/asm/msr-index.h
>index 19e22f5..9e96fb8 100644
>--- a/arch/x86/include/asm/msr-index.h
>+++ b/arch/x86/include/asm/msr-index.h
>@@ -34,10 +34,6 @@
> #define MSR_IA32_PERFCTR1		0x000000c2
> #define MSR_FSB_FREQ			0x000000cd
> 
>-#define MSR_NHM_SNB_PKG_CST_CFG_CTL	0x000000e2
>-#define NHM_C3_AUTO_DEMOTE		(1UL << 25)
>-#define NHM_C1_AUTO_DEMOTE		(1UL << 26)
>-
> #define MSR_MTRRcap			0x000000fe
> #define MSR_IA32_BBL_CR_CTL		0x00000119
> #define MSR_IA32_BBL_CR_CTL3		0x0000011e
>diff --git a/drivers/idle/intel_idle.c b/drivers/idle/intel_idle.c
>index 289f690..4781310 100755
>--- a/drivers/idle/intel_idle.c
>+++ b/drivers/idle/intel_idle.c
>@@ -62,7 +62,6 @@
> #include <linux/notifier.h>
> #include <linux/cpu.h>
> #include <asm/mwait.h>
>-#include <asm/msr.h>
> 
> #define INTEL_IDLE_VERSION "0.4"
> #define PREFIX "intel_idle: "
>@@ -86,12 +85,6 @@ static int intel_idle(struct cpuidle_device *dev, struct cpuidle_state *state);
> static struct cpuidle_state *cpuidle_state_table;
> 
> /*
>- * Hardware C-state auto-demotion may not always be optimal.
>- * Indicate which enable bits to clear here.
>- */
>-static unsigned long long auto_demotion_disable_flags;
>-
>-/*
>  * States are indexed by the cstate number,
>  * which is also the index into the MWAIT hint array.
>  * Thus C0 is a dummy.
>@@ -358,8 +351,6 @@ static int intel_idle_probe(void)
> 	case 0x25:	/* Westmere */
> 	case 0x2C:	/* Westmere */
> 		cpuidle_state_table = nehalem_cstates;
>-		auto_demotion_disable_flags =
>-			(NHM_C1_AUTO_DEMOTE | NHM_C3_AUTO_DEMOTE);
> 		break;
> 
> 	case 0x1C:	/* 28 - Atom Processor */
>@@ -397,15 +388,6 @@ static int intel_idle_probe(void)
> 	return 0;
> }
> 
>-static void auto_demotion_disable(void *dummy)
>-{
>-	unsigned long long msr_bits;
>-
>-	rdmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
>-	msr_bits &= ~auto_demotion_disable_flags;
>-	wrmsrl(MSR_NHM_SNB_PKG_CST_CFG_CTL, msr_bits);
>-}
>-
> /*
>  * intel_idle_cpuidle_devices_uninit()
>  * unregister, free cpuidle_devices
>@@ -485,8 +467,6 @@ static int intel_idle_cpuidle_devices_init(void)
> 			return -EIO;
> 		}
> 	}
>-	if (auto_demotion_disable_flags)
>-		smp_call_function(auto_demotion_disable, NULL, 1);
> 
> 	return 0;
> }

Actions: View | Diff

Attachments on bug 834097: 593301 | 593302 | 603345 | 603558 | 610140 | 610842 | 610843 | 610844 | 610845 | 611430 | 611432 | 611529 | 611908 | 611909 | 614408 | 621607