diff options
| author | Jonathan Gray <jsg@cvs.openbsd.org> | 2012-01-07 05:55:09 +0000 |
|---|---|---|
| committer | Jonathan Gray <jsg@cvs.openbsd.org> | 2012-01-07 05:55:09 +0000 |
| commit | e7992e5c157e75441fd64d935df67555266ee066 (patch) | |
| tree | 6d02e3c1532ea93b335eb1392777fb5a567514fb /sys/arch/amd64 | |
| parent | 9c22654341479292c2a155db5eff66302470f976 (diff) | |
Check that we have pstates in _PSS before calling the pstate status MSR.
While the docs say we should check a bit in cpuid this should work as well.
Fixes problems related a fictitious AMD machine dreamed up by Linux KVM.
Reported/tested by Walter Haidinger, diff from Bryan Steele.
Diffstat (limited to 'sys/arch/amd64')
| -rw-r--r-- | sys/arch/amd64/amd64/k1x-pstate.c | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/sys/arch/amd64/amd64/k1x-pstate.c b/sys/arch/amd64/amd64/k1x-pstate.c index d0c112f9e60..8608e657aae 100644 --- a/sys/arch/amd64/amd64/k1x-pstate.c +++ b/sys/arch/amd64/amd64/k1x-pstate.c @@ -1,4 +1,4 @@ -/* $OpenBSD: k1x-pstate.c,v 1.2 2011/05/29 12:29:28 claudio Exp $ */ +/* $OpenBSD: k1x-pstate.c,v 1.3 2012/01/07 05:55:08 jsg Exp $ */ /* * Copyright (c) 2011 Bryan Steele <brynet@gmail.com> * @@ -75,7 +75,7 @@ struct k1x_cpu_state *k1x_current_state; void k1x_transition(struct k1x_cpu_state *, int); #if NACPICPU > 0 -void k1x_acpi_init(struct k1x_cpu_state *, u_int64_t); +void k1x_acpi_init(struct k1x_cpu_state *); void k1x_acpi_states(struct k1x_cpu_state *, struct acpicpu_pss *, int, u_int64_t); #endif @@ -154,14 +154,17 @@ k1x_acpi_states(struct k1x_cpu_state *cstate, struct acpicpu_pss *pss, } void -k1x_acpi_init(struct k1x_cpu_state *cstate, u_int64_t msr) +k1x_acpi_init(struct k1x_cpu_state *cstate) { struct acpicpu_pss *pss; + u_int64_t msr; cstate->n_states = acpicpu_fetch_pss(&pss); if (cstate->n_states == 0) return; + msr = rdmsr(MSR_K1X_STATUS); + k1x_acpi_states(cstate, pss, cstate->n_states, msr); return; @@ -172,12 +175,9 @@ k1x_acpi_init(struct k1x_cpu_state *cstate, u_int64_t msr) void k1x_init(struct cpu_info *ci) { -#if NACPICPU > 0 - u_int64_t msr; -#endif - u_int i; struct k1x_cpu_state *cstate; struct k1x_state *state; + u_int i; if (setperf_prio > 1) return; @@ -189,8 +189,7 @@ k1x_init(struct cpu_info *ci) cstate->n_states = 0; #if NACPICPU > 0 - msr = rdmsr(MSR_K1X_STATUS); - k1x_acpi_init(cstate, msr); + k1x_acpi_init(cstate); #endif if (cstate->n_states) { printf("%s: %d MHz: speeds:", |