From: Wei Huang <wei.huang2@amd.com>
Date: Thu, 7 Apr 2011 14:21:41 +0000 (+0100)
Subject: x86, amd, MTRR: correct DramModEn bit of SYS_CFG MSR
X-Git-Tag: 4.1.1-rc1~40
X-Git-Url: http://xenbits.xensource.com/gitweb?a=commitdiff_plain;h=6b8e1135a0d5fcd2fff08533b5be6e7abb9862a8;p=people%2Fvhanquez%2Fxen.git

x86, amd, MTRR: correct DramModEn bit of SYS_CFG MSR

Some buggy BIOS might set SYS_CFG DramModEn bit to 1, which can cause
unexpected behavior on AMD platforms. This patch clears DramModEn bit
if it is 1.

Signed-off-by: Wei Huang <wei.huang2@amd.com>
xen-unstable changeset:   23153:8fb61c9ebe49
xen-unstable date:        Wed Apr 06 09:01:31 2011 +0100
---

diff --git a/xen/arch/x86/cpu/amd.c b/xen/arch/x86/cpu/amd.c
index e2cded6a3..4f3cdd961 100644
--- a/xen/arch/x86/cpu/amd.c
+++ b/xen/arch/x86/cpu/amd.c
@@ -318,6 +318,32 @@ static void check_disable_c1e(unsigned int port, u8 value)
 		on_each_cpu(disable_c1e, NULL, 1);
 }
 
+/*
+ * BIOS is expected to clear MtrrFixDramModEn bit. According to AMD BKDG : 
+ * "The MtrrFixDramModEn bit should be set to 1 during BIOS initalization of 
+ * the fixed MTRRs, then cleared to 0 for operation."
+ */
+static void check_syscfg_dram_mod_en(void)
+{
+	uint64_t syscfg;
+	static bool_t printed = 0;
+
+	if (!((boot_cpu_data.x86_vendor == X86_VENDOR_AMD) &&
+		(boot_cpu_data.x86 >= 0x0f)))
+		return;
+
+	rdmsrl(MSR_K8_SYSCFG, syscfg);
+	if (!(syscfg & K8_MTRRFIXRANGE_DRAM_MODIFY))
+		return;
+
+	if (!test_and_set_bool(printed))
+		printk(KERN_ERR "MTRR: SYSCFG[MtrrFixDramModEn] not "
+			"cleared by BIOS, clearing this bit\n");
+
+	syscfg &= ~K8_MTRRFIXRANGE_DRAM_MODIFY;
+	wrmsrl(MSR_K8_SYSCFG, syscfg);
+}
+
 static void __devinit init_amd(struct cpuinfo_x86 *c)
 {
 	u32 l, h;
@@ -587,6 +613,8 @@ static void __devinit init_amd(struct cpuinfo_x86 *c)
 		disable_c1_ramping();
 
 	set_cpuidmask(c);
+
+	check_syscfg_dram_mod_en();
 }
 
 static unsigned int __cpuinit amd_size_cache(struct cpuinfo_x86 * c, unsigned int size)