From: Jan Beulich <jbeulich@suse.com>
Date: Fri, 26 Jun 2015 13:05:50 +0000 (+0200)
Subject: x86/AMD: also print TOM2 when printing MTRR state
X-Git-Tag: archive/raspbian/4.8.0-1+rpi1~1^2~3021^2
X-Git-Url: https://dgit.raspbian.org/?a=commitdiff_plain;h=637c2646e27848222b9f2c94d663449678b1d7f1;p=xen.git

x86/AMD: also print TOM2 when printing MTRR state

... to have a complete picture of cachability settings.

Signed-off-by: Jan Beulich <jbeulich@suse.com>
Reviewed-by: Andrew Cooper <andrew.cooper3@citrix.com>
---

diff --git a/xen/arch/x86/cpu/mtrr/generic.c b/xen/arch/x86/cpu/mtrr/generic.c
index 493830b58c..935f0a0e8a 100644
--- a/xen/arch/x86/cpu/mtrr/generic.c
+++ b/xen/arch/x86/cpu/mtrr/generic.c
@@ -182,6 +182,18 @@ static void __init print_mtrr_state(const char *level)
 		else
 			printk("%s  %u disabled\n", level, i);
 	}
+
+	if (boot_cpu_data.x86_vendor == X86_VENDOR_AMD
+	    && boot_cpu_data.x86 >= 0xf) {
+		uint64_t syscfg, tom2;
+
+		rdmsrl(MSR_K8_SYSCFG, syscfg);
+		if (syscfg & (1 << 21)) {
+			rdmsrl(MSR_K8_TOP_MEM2, tom2);
+			printk("%sTOM2: %012"PRIx64"%s\n", level, tom2,
+			       syscfg & (1 << 22) ? " (WB)" : "");
+		}
+	}
 }
 
 /*  Some BIOS's are fucked and don't set all MTRRs the same!  */