From 55f93ca1c165f042368cded838c78f179b3fc606 Mon Sep 17 00:00:00 2001 From: avg Date: Fri, 11 Mar 2011 14:53:34 +0000 Subject: [PATCH] MFC r215523: specialreg.h: add AMD-specific "Hardware Configuration Register" MSR git-svn-id: svn://svn.freebsd.org/base/stable/8@219486 ccf9f872-aa2e-dd11-9fc8-001c23d0bc1f --- sys/amd64/include/specialreg.h | 1 + sys/i386/i386/initcpu.c | 2 +- sys/i386/include/specialreg.h | 3 ++- 3 files changed, 4 insertions(+), 2 deletions(-) diff --git a/sys/amd64/include/specialreg.h b/sys/amd64/include/specialreg.h index 286e10d07..457177162 100644 --- a/sys/amd64/include/specialreg.h +++ b/sys/amd64/include/specialreg.h @@ -504,6 +504,7 @@ #define MSR_PERFCTR2 0xc0010006 #define MSR_PERFCTR3 0xc0010007 #define MSR_SYSCFG 0xc0010010 +#define MSR_HWCR 0xc0010015 #define MSR_IORRBASE0 0xc0010016 #define MSR_IORRMASK0 0xc0010017 #define MSR_IORRBASE1 0xc0010018 diff --git a/sys/i386/i386/initcpu.c b/sys/i386/i386/initcpu.c index 902076532..b7fa78ce7 100644 --- a/sys/i386/i386/initcpu.c +++ b/sys/i386/i386/initcpu.c @@ -672,7 +672,7 @@ initializecpu(void) (cpu_id & ~0xf) == 0x670 || (cpu_id & ~0xf) == 0x680)) { u_int regs[4]; - wrmsr(0xC0010015, rdmsr(0xC0010015) & ~0x08000); + wrmsr(MSR_HWCR, rdmsr(MSR_HWCR) & ~0x08000); do_cpuid(1, regs); cpu_feature = regs[3]; } diff --git a/sys/i386/include/specialreg.h b/sys/i386/include/specialreg.h index 4431eeb6a..d1cf4f05e 100644 --- a/sys/i386/include/specialreg.h +++ b/sys/i386/include/specialreg.h @@ -554,7 +554,8 @@ #define AMD_WT_ALLOC_FRE 0x10000 /* fixed (A0000-FFFFF) range enable */ /* AMD64 MSR's */ -#define MSR_EFER 0xc0000080 /* extended features */ +#define MSR_EFER 0xc0000080 /* extended features */ +#define MSR_HWCR 0xc0010015 #define MSR_K8_UCODE_UPDATE 0xc0010020 /* update microcode */ #define MSR_MC0_CTL_MASK 0xc0010044 -- 2.45.0