From 663dcc3f9fd3820372803855330ae78840ef6eb3 Mon Sep 17 00:00:00 2001 From: Gordon Willem Klok Date: Sun, 15 Jun 2008 00:10:48 +0000 Subject: Ensure that when using the ACPI tables the RVO field is initialized from the ctrl value. commit it marco@ --- sys/arch/amd64/amd64/powernow-k8.c | 5 ++++- sys/arch/i386/i386/powernow-k8.c | 5 ++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/arch/amd64/amd64/powernow-k8.c b/sys/arch/amd64/amd64/powernow-k8.c index 6409218e574..ef02ff3e55b 100644 --- a/sys/arch/amd64/amd64/powernow-k8.c +++ b/sys/arch/amd64/amd64/powernow-k8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: powernow-k8.c,v 1.19 2007/05/31 17:49:15 gwk Exp $ */ +/* $OpenBSD: powernow-k8.c,v 1.20 2008/06/15 00:10:47 gwk Exp $ */ /* * Copyright (c) 2004 Martin Végiard. * Copyright (c) 2004-2005 Bruno Ducrot @@ -344,6 +344,8 @@ k8pnow_acpi_pss_changed(struct acpicpu_pss * pss, int npss) curs = k8pnow_acpi_states(cstate, pss, npss, status); ctrl = pss[curs].pss_ctrl; + + cstate->rvo = PN8_ACPI_CTRL_TO_RVO(ctrl); cstate->vst = PN8_ACPI_CTRL_TO_VST(ctrl); cstate->mvs = PN8_ACPI_CTRL_TO_MVS(ctrl); cstate->pll = PN8_ACPI_CTRL_TO_PLL(ctrl); @@ -367,6 +369,7 @@ k8pnow_acpi_init(struct k8pnow_cpu_state * cstate, uint64_t status) curs = k8pnow_acpi_states(cstate, pss, cstate->n_states, status); ctrl = pss[curs].pss_ctrl; + cstate->rvo = PN8_ACPI_CTRL_TO_RVO(ctrl); cstate->vst = PN8_ACPI_CTRL_TO_VST(ctrl); cstate->mvs = PN8_ACPI_CTRL_TO_MVS(ctrl); cstate->pll = PN8_ACPI_CTRL_TO_PLL(ctrl); diff --git a/sys/arch/i386/i386/powernow-k8.c b/sys/arch/i386/i386/powernow-k8.c index 8e4e2204fe8..af296e02fc3 100644 --- a/sys/arch/i386/i386/powernow-k8.c +++ b/sys/arch/i386/i386/powernow-k8.c @@ -1,4 +1,4 @@ -/* $OpenBSD: powernow-k8.c,v 1.23 2007/05/31 17:49:16 gwk Exp $ */ +/* $OpenBSD: powernow-k8.c,v 1.24 2008/06/15 00:10:47 gwk Exp $ */ /* * Copyright (c) 2004 Martin Végiard. @@ -391,6 +391,8 @@ k8pnow_acpi_pss_changed(struct acpicpu_pss * pss, int npss) curs = k8pnow_acpi_states(cstate, pss, npss, status); ctrl = pss[curs].pss_ctrl; + + cstate->rvo = PN8_ACPI_CTRL_TO_RVO(ctrl); cstate->vst = PN8_ACPI_CTRL_TO_VST(ctrl); cstate->mvs = PN8_ACPI_CTRL_TO_MVS(ctrl); cstate->pll = PN8_ACPI_CTRL_TO_PLL(ctrl); @@ -414,6 +416,7 @@ k8pnow_acpi_init(struct k8pnow_cpu_state * cstate, uint64_t status) curs = k8pnow_acpi_states(cstate, pss, cstate->n_states, status); ctrl = pss[curs].pss_ctrl; + cstate->rvo = PN8_ACPI_CTRL_TO_RVO(ctrl); cstate->vst = PN8_ACPI_CTRL_TO_VST(ctrl); cstate->mvs = PN8_ACPI_CTRL_TO_MVS(ctrl); cstate->pll = PN8_ACPI_CTRL_TO_PLL(ctrl); -- cgit v1.2.3