svn commit: r240240 - releng/9.1/sys/amd64/amd64

[Konstantin Belousov]

Author: kib
Date: Sat Sep  8 16:47:52 2012
New Revision: 240240
URL: http://svn.freebsd.org/changeset/base/240240

Log:
  MFC r239125:
  Do not apply errata 721 workaround when under hypervisor, since
  typical hypervisor does not implement access to the required MSR,
  causing #GP on boot.
  
  PR:	amd64/170388
  Approved by:	re (kensmith)

Modified:
  releng/9.1/sys/amd64/amd64/initcpu.c
Directory Properties:
  releng/9.1/sys/   (props changed)

Modified: releng/9.1/sys/amd64/amd64/initcpu.c
==============================================================================
--- releng/9.1/sys/amd64/amd64/initcpu.c	Sat Sep  8 16:45:48 2012	(r240239)
+++ releng/9.1/sys/amd64/amd64/initcpu.c	Sat Sep  8 16:47:52 2012	(r240240)
@@ -91,11 +91,17 @@ init_amd(void)
 	 *
 	 * http://support.amd.com/us/Processor_TechDocs/41322_10h_Rev_Gd.pdf
 	 * http://support.amd.com/us/Processor_TechDocs/44739_12h_Rev_Gd.pdf
+	 *
+	 * Hypervisors do not provide access to the errata MSR,
+	 * causing #GP exception on attempt to apply the errata.  The
+	 * MSR write shall be done on host and persist globally
+	 * anyway, so do not try to do it when under virtualization.
 	 */
 	switch (CPUID_TO_FAMILY(cpu_id)) {
 	case 0x10:
 	case 0x12:
-		wrmsr(0xc0011029, rdmsr(0xc0011029) | 1);
+		if ((cpu_feature2 & CPUID2_HV) == 0)
+			wrmsr(0xc0011029, rdmsr(0xc0011029) | 1);
 		break;
 	}
 }