Module Name: src Committed By: jruoho Date: Tue Feb 22 09:39:48 UTC 2011
Modified Files: src/sys/dev/acpi: acpi_cpu_cstate.c Log Message: Always declare HALT as available. If ACPI_FADT_C1_SUPPORTED is not set in the FADT, print a warning, as it is obviously a BIOS bug. To generate a diff of this commit: cvs rdiff -u -r1.38 -r1.39 src/sys/dev/acpi/acpi_cpu_cstate.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.38 src/sys/dev/acpi/acpi_cpu_cstate.c:1.39 --- src/sys/dev/acpi/acpi_cpu_cstate.c:1.38 Tue Feb 22 09:34:13 2011 +++ src/sys/dev/acpi/acpi_cpu_cstate.c Tue Feb 22 09:39:48 2011 @@ -1,4 +1,4 @@ -/* $NetBSD: acpi_cpu_cstate.c,v 1.38 2011/02/22 09:34:13 jruoho Exp $ */ +/* $NetBSD: acpi_cpu_cstate.c,v 1.39 2011/02/22 09:39:48 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.38 2011/02/22 09:34:13 jruoho Exp $"); +__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.39 2011/02/22 09:39:48 jruoho Exp $"); #include <sys/param.h> #include <sys/cpu.h> @@ -538,8 +538,10 @@ /* * All x86 processors should support C1 (a.k.a. HALT). */ - if ((AcpiGbl_FADT.Flags & ACPI_FADT_C1_SUPPORTED) != 0) - cs[ACPI_STATE_C1].cs_method = ACPICPU_C_STATE_HALT; + cs[ACPI_STATE_C1].cs_method = ACPICPU_C_STATE_HALT; + + if ((AcpiGbl_FADT.Flags & ACPI_FADT_C1_SUPPORTED) == 0) + aprint_debug_dev(sc->sc_dev, "HALT not supported?\n"); if (sc->sc_object.ao_pblkaddr == 0) return;