Aren/NetBSD
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Yet another small fix to the C-state parsing. As can be seen from the _CST

Browse Source 
object noted in the revision 1.40, there is only one C-state on the machine,
yet the BIOS define its type as C2. Thus, instead of relying on the BIOS
data, sequentially count the parsed C-states.
This commit is contained in:
jruoho 2011-02-22 17:16:04 +00:00
parent d66709fd74
commit f7e44b18e5
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
sys/dev/acpi/acpi_cpu_cstate.c
View File

@ -1,4 +1,4 @@
/* $NetBSD: acpi_cpu_cstate.c,v 1.41 2011/02/22 16:39:05 jmcneill Exp $ */
/* $NetBSD: acpi_cpu_cstate.c,v 1.42 2011/02/22 17:16:04 jruoho Exp $ */
/*-
* Copyright (c) 2010 Jukka Ruohonen <jruohonen@iki.fi>
@ -27,7 +27,7 @@
* SUCH DAMAGE.
*/
#include <sys/cdefs.h>
__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.41 2011/02/22 16:39:05 jmcneill Exp $");
__KERNEL_RCSID(0, "$NetBSD: acpi_cpu_cstate.c,v 1.42 2011/02/22 17:16:04 jruoho Exp $");
#include <sys/param.h>
#include <sys/cpu.h>
@ -331,6 +331,7 @@ acpicpu_cstate_cst_add(struct acpicpu_softc *sc, ACPI_OBJECT *elm)
struct acpicpu_reg *reg;
ACPI_STATUS rv = AE_OK;
ACPI_OBJECT *obj;
static int i = 1;
uint32_t type;
(void)memset(&state, 0, sizeof(*cs));
@ -469,17 +470,19 @@ acpicpu_cstate_cst_add(struct acpicpu_softc *sc, ACPI_OBJECT *elm)
goto out;
}
cs[type].cs_addr = state.cs_addr;
cs[type].cs_power = state.cs_power;
cs[type].cs_flags = state.cs_flags;
cs[type].cs_method = state.cs_method;
cs[type].cs_latency = state.cs_latency;
cs[i].cs_addr = state.cs_addr;
cs[i].cs_power = state.cs_power;
cs[i].cs_flags = state.cs_flags;
cs[i].cs_method = state.cs_method;
cs[i].cs_latency = state.cs_latency;
out:
if (ACPI_FAILURE(rv))
aprint_error_dev(sc->sc_dev, "failed to add "
"C-state: %s\n", AcpiFormatException(rv));
i++;
return rv;
}