svn commit: r365642 - in head/sys: amd64/amd64 x86/include

[John Baldwin]

Author: jhb
Date: Fri Sep 11 20:32:40 2020
New Revision: 365642
URL: https://svnweb.freebsd.org/changeset/base/365642

Log:
  Add constant for the DE_CFG MSR on AMD CPUs.
  
  Reported by:	Patrick Mooney <pmooney at pfmooney.com>
  MFC after:	2 weeks
  Differential Revision:	https://reviews.freebsd.org/D25885

Modified:
  head/sys/amd64/amd64/initcpu.c
  head/sys/x86/include/specialreg.h

Modified: head/sys/amd64/amd64/initcpu.c
==============================================================================
--- head/sys/amd64/amd64/initcpu.c	Fri Sep 11 19:45:26 2020	(r365641)
+++ head/sys/amd64/amd64/initcpu.c	Fri Sep 11 20:32:40 2020	(r365642)
@@ -86,7 +86,7 @@ init_amd(void)
 	case 0x10:
 	case 0x12:
 		if ((cpu_feature2 & CPUID2_HV) == 0)
-			wrmsr(0xc0011029, rdmsr(0xc0011029) | 1);
+			wrmsr(MSR_DE_CFG, rdmsr(MSR_DE_CFG) | 1);
 		break;
 	}
 
@@ -135,9 +135,9 @@ init_amd(void)
 	if (CPUID_TO_FAMILY(cpu_id) == 0x17 && CPUID_TO_MODEL(cpu_id) == 0x1 &&
 	    (cpu_feature2 & CPUID2_HV) == 0) {
 		/* 1021 */
-		msr = rdmsr(0xc0011029);
+		msr = rdmsr(MSR_DE_CFG);
 		msr |= 0x2000;
-		wrmsr(0xc0011029, msr);
+		wrmsr(MSR_DE_CFG, msr);
 
 		/* 1033 */
 		msr = rdmsr(MSR_LS_CFG);

Modified: head/sys/x86/include/specialreg.h
==============================================================================
--- head/sys/x86/include/specialreg.h	Fri Sep 11 19:45:26 2020	(r365641)
+++ head/sys/x86/include/specialreg.h	Fri Sep 11 20:32:40 2020	(r365642)
@@ -1138,6 +1138,7 @@
 #define	MSR_EXTFEATURES	0xc0011005	/* Extended CPUID Features override */
 #define	MSR_LS_CFG	0xc0011020
 #define	MSR_IC_CFG	0xc0011021	/* Instruction Cache Configuration */
+#define	MSR_DE_CFG	0xc0011029	/* Decode Configuration */
 
 /* MSR_VM_CR related */
 #define	VM_CR_SVMDIS		0x10	/* SVM: disabled by BIOS */