diff options
| author | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-07-25 22:47:55 +0000 |
|---|---|---|
| committer | Michael Shalayeff <mickey@cvs.openbsd.org> | 2003-07-25 22:47:55 +0000 |
| commit | df2eee892941b95433346d4324b983f0ee5b7bf0 (patch) | |
| tree | 9c330425fd4a34eedda10940e2d81bea09f81c34 /sys/arch | |
| parent | 54a3a21a4606d783c77efd46eaa2e25a4b4229eb (diff) | |
use names not numbers for msrs, do not define yet another implementation of wrmsr/rdmsr
Diffstat (limited to 'sys/arch')
| -rw-r--r-- | sys/arch/i386/i386/machdep.c | 18 | ||||
| -rw-r--r-- | sys/arch/i386/i386/pctr.c | 6 |
2 files changed, 7 insertions, 17 deletions
diff --git a/sys/arch/i386/i386/machdep.c b/sys/arch/i386/i386/machdep.c index 9a2132f73bd..28ae168b126 100644 --- a/sys/arch/i386/i386/machdep.c +++ b/sys/arch/i386/i386/machdep.c @@ -1,4 +1,4 @@ -/* $OpenBSD: machdep.c,v 1.239 2003/07/25 21:42:02 mickey Exp $ */ +/* $OpenBSD: machdep.c,v 1.240 2003/07/25 22:47:54 mickey Exp $ */ /* $NetBSD: machdep.c,v 1.214 1996/11/10 03:16:17 thorpej Exp $ */ /*- @@ -1244,14 +1244,6 @@ intel686_cpu_setup(cpu_device, model, step) { extern int cpu_feature, cpuid_level; u_quad_t msr119; -#define rdmsr(msr) \ -({ \ - u_quad_t v; \ - __asm __volatile ("rdmsr" : "=A" (v) : "c" (msr)); \ - v; \ -}) -#define wrmsr(msr, v) \ - __asm __volatile ("wrmsr" :: "A" ((u_quad_t) (v)), "c" (msr)); /* * Original PPro returns SYSCALL in CPUID but is non-functional. @@ -1270,16 +1262,14 @@ intel686_cpu_setup(cpu_device, model, step) * Disable the Pentium3 serial number. */ if ((model == 7) && (cpu_feature & CPUID_SER)) { - msr119 = rdmsr(0x119); - msr119 |= 0x0000000000200000; - wrmsr(0x119, msr119); + msr119 = rdmsr(MSR_BBL_CR_CTL); + msr119 |= 0x0000000000200000LL; + wrmsr(MSR_BBL_CR_CTL, msr119); printf("%s: disabling processor serial number\n", cpu_device); cpu_feature &= ~CPUID_SER; cpuid_level = 2; } -#undef rdmsr -#undef wrmsr } void diff --git a/sys/arch/i386/i386/pctr.c b/sys/arch/i386/i386/pctr.c index d8a171bdce5..a7dfe6182a4 100644 --- a/sys/arch/i386/i386/pctr.c +++ b/sys/arch/i386/i386/pctr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: pctr.c,v 1.16 2003/05/27 23:52:01 fgsch Exp $ */ +/* $OpenBSD: pctr.c,v 1.17 2003/07/25 22:47:54 mickey Exp $ */ /* * Pentium performance counter driver for OpenBSD. @@ -120,10 +120,10 @@ p5ctrsel (fflag, cmd, fn) if (fn >= 0x200) return EINVAL; - msr11 = rdmsr (0x11); + msr11 = rdmsr (P5MSR_CTRSEL); msr11 &= ~(0x1ffLL << shift); msr11 |= fn << shift; - wrmsr (0x11, msr11); + wrmsr (P5MSR_CTRSEL, msr11); wrmsr (msr, 0); return 0; |