Module Name: src
Committed By: jruoho
Date: Sat Sep 24 10:59:02 UTC 2011
Modified Files:
src/sys/arch/x86/acpi: acpi_cpu_md.c
Log Message:
As the detection of C1E is not entirely clear-cut, use rdmsr_safe()
when reading the AMD "interrupt pending and CMP-halt register".
To generate a diff of this commit:
cvs rdiff -u -r1.64 -r1.65 src/sys/arch/x86/acpi/acpi_cpu_md.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/arch/x86/acpi/acpi_cpu_md.c
diff -u src/sys/arch/x86/acpi/acpi_cpu_md.c:1.64 src/sys/arch/x86/acpi/acpi_cpu_md.c:1.65
--- src/sys/arch/x86/acpi/acpi_cpu_md.c:1.64 Wed Jul 13 07:34:55 2011
+++ src/sys/arch/x86/acpi/acpi_cpu_md.c Sat Sep 24 10:59:02 2011
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_md.c,v 1.64 2011/07/13 07:34:55 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_md.c,v 1.65 2011/09/24 10:59:02 jruoho Exp $ */
/*-
* Copyright (c) 2010, 2011 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.64 2011/07/13 07:34:55 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_md.c,v 1.65 2011/09/24 10:59:02 jruoho Exp $");
#include <sys/param.h>
#include <sys/bus.h>
@@ -336,7 +336,8 @@
const uint64_t c1e = MSR_CMPHALT_SMI | MSR_CMPHALT_C1E;
uint64_t val;
- val = rdmsr(MSR_CMPHALT);
+ if (__predict_false(rdmsr_safe(MSR_CMPHALT, &val) == EFAULT))
+ return;
if ((val & c1e) != 0)
wrmsr(MSR_CMPHALT, val & ~c1e);
