Mailing List Archive

# HG changeset patch
# User Keir Fraser <keir.fraser@citrix.com>
# Date 1277468629 -3600
# Node ID 4001ab0d578520c6836c6e8fea066b3a8eba32eb
# Parent aae1c7606c6a545e2d4f5937e529ed6f0296952f
x86 cpufreq: Fixes after msr cleanup patch

Signed-off-by: Keir Fraser <keir.fraser@citrix.com>
---
xen/arch/x86/acpi/cpufreq/cpufreq.c | 2 +-
xen/arch/x86/acpi/cpufreq/powernow.c | 4 ++--
2 files changed, 3 insertions(+), 3 deletions(-)

diff -r aae1c7606c6a -r 4001ab0d5785 xen/arch/x86/acpi/cpufreq/cpufreq.c
--- a/xen/arch/x86/acpi/cpufreq/cpufreq.c Fri Jun 25 13:10:46 2010 +0100
+++ b/xen/arch/x86/acpi/cpufreq/cpufreq.c Fri Jun 25 13:23:49 2010 +0100
@@ -51,7 +51,7 @@ enum {
SYSTEM_IO_CAPABLE,
};

-#define INTEL_MSR_RANGE (0xffff)
+#define INTEL_MSR_RANGE (0xffffull)
#define CPUID_6_ECX_APERFMPERF_CAPABILITY (0x1)

static struct acpi_cpufreq_data *drv_data[NR_CPUS];
diff -r aae1c7606c6a -r 4001ab0d5785 xen/arch/x86/acpi/cpufreq/powernow.c
--- a/xen/arch/x86/acpi/cpufreq/powernow.c Fri Jun 25 13:10:46 2010 +0100
+++ b/xen/arch/x86/acpi/cpufreq/powernow.c Fri Jun 25 13:23:49 2010 +0100
@@ -44,13 +44,13 @@
#define USE_HW_PSTATE 0x00000080
#define HW_PSTATE_MASK 0x00000007
#define HW_PSTATE_VALID_MASK 0x80000000
-#define HW_PSTATE_MAX_MASK 0x000000f000000000ULL
+#define HW_PSTATE_MAX_MASK 0x000000f0
#define HW_PSTATE_MAX_SHIFT 4
#define MSR_PSTATE_DEF_BASE 0xc0010064 /* base of Pstate MSRs */
#define MSR_PSTATE_STATUS 0xc0010063 /* Pstate Status MSR */
#define MSR_PSTATE_CTRL 0xc0010062 /* Pstate control MSR */
#define MSR_PSTATE_CUR_LIMIT 0xc0010061 /* pstate current limit MSR */
-#define MSR_HWCR_CPBDIS_MASK 0x02000000
+#define MSR_HWCR_CPBDIS_MASK 0x02000000ULL

struct powernow_cpufreq_data {
struct processor_performance *acpi_data;

_______________________________________________
Xen-changelog mailing list
Xen-changelog@lists.xensource.com
http://lists.xensource.com/xen-changelog