Module Name: src
Committed By: jruoho
Date: Sat Aug 14 17:27:34 UTC 2010
Modified Files:
src/sys/dev/acpi: acpi_cpu_cstate.c acpi_cpu_pstate.c
Log Message:
Do not accidentally write zeros to (PSTATE_CNT and CST_CNT) registers.
To generate a diff of this commit:
cvs rdiff -u -r1.26 -r1.27 src/sys/dev/acpi/acpi_cpu_cstate.c
cvs rdiff -u -r1.18 -r1.19 src/sys/dev/acpi/acpi_cpu_pstate.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/dev/acpi/acpi_cpu_cstate.c
diff -u src/sys/dev/acpi/acpi_cpu_cstate.c:1.26 src/sys/dev/acpi/acpi_cpu_cstate.c:1.27
--- src/sys/dev/acpi/acpi_cpu_cstate.c:1.26 Sat Aug 14 05:41:22 2010
+++ src/sys/dev/acpi/acpi_cpu_cstate.c Sat Aug 14 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_cstate.c,v 1.26 2010/08/14 05:41:22 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_cstate.c,v 1.27 2010/08/14 17:27:34 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.26 2010/08/14 05:41:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.27 2010/08/14 17:27:34 jruoho Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@@ -511,7 +511,7 @@
const uint8_t val = AcpiGbl_FADT.CstControl;
const uint32_t addr = AcpiGbl_FADT.SmiCommand;
- if (addr == 0)
+ if (addr == 0 || val == 0)
return;
(void)AcpiOsWritePort(addr, val, 8);
Index: src/sys/dev/acpi/acpi_cpu_pstate.c
diff -u src/sys/dev/acpi/acpi_cpu_pstate.c:1.18 src/sys/dev/acpi/acpi_cpu_pstate.c:1.19
--- src/sys/dev/acpi/acpi_cpu_pstate.c:1.18 Sat Aug 14 05:41:22 2010
+++ src/sys/dev/acpi/acpi_cpu_pstate.c Sat Aug 14 17:27:34 2010
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_cpu_pstate.c,v 1.18 2010/08/14 05:41:22 jruoho Exp $ */
+/* $NetBSD: acpi_cpu_pstate.c,v 1.19 2010/08/14 17:27:34 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruoho...@iki.fi>
@@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.18 2010/08/14 05:41:22 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_pstate.c,v 1.19 2010/08/14 17:27:34 jruoho Exp $");
#include <sys/param.h>
#include <sys/evcnt.h>
@@ -529,7 +529,7 @@
const uint8_t val = AcpiGbl_FADT.PstateControl;
const uint32_t addr = AcpiGbl_FADT.SmiCommand;
- if (addr == 0)
+ if (addr == 0 || val == 0)
return;
(void)AcpiOsWritePort(addr, val, 8);
