summaryrefslogtreecommitdiffstats
path: root/sys/dev/acpica
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2008-11-19 20:31:38 +0000
committerjkim <jkim@FreeBSD.org>2008-11-19 20:31:38 +0000
commit7b13c0b67fe4faddf2a0d17534738004968d0549 (patch)
tree194c18706d57112592766dc0ee815f35b8c04e29 /sys/dev/acpica
parentf8948bf5efabc455b0c41ac75815dbba979468c3 (diff)
downloadFreeBSD-src-7b13c0b67fe4faddf2a0d17534738004968d0549.zip
FreeBSD-src-7b13c0b67fe4faddf2a0d17534738004968d0549.tar.gz
Make sure legacy replacement route is turned off when enbling HPET.
Reviewed by: jhb
Diffstat (limited to 'sys/dev/acpica')
-rw-r--r--sys/dev/acpica/acpi_hpet.c7
1 files changed, 5 insertions, 2 deletions
diff --git a/sys/dev/acpica/acpi_hpet.c b/sys/dev/acpica/acpi_hpet.c
index 77c6a7d..17022bb 100644
--- a/sys/dev/acpica/acpi_hpet.c
+++ b/sys/dev/acpica/acpi_hpet.c
@@ -83,7 +83,9 @@ hpet_enable(struct acpi_hpet_softc *sc)
uint32_t val;
val = bus_read_4(sc->mem_res, HPET_CONFIG);
- bus_write_4(sc->mem_res, HPET_CONFIG, val | HPET_CNF_ENABLE);
+ val &= ~HPET_CNF_LEG_RT;
+ val |= HPET_CNF_ENABLE;
+ bus_write_4(sc->mem_res, HPET_CONFIG, val);
}
static void
@@ -92,7 +94,8 @@ hpet_disable(struct acpi_hpet_softc *sc)
uint32_t val;
val = bus_read_4(sc->mem_res, HPET_CONFIG);
- bus_write_4(sc->mem_res, HPET_CONFIG, val & ~HPET_CNF_ENABLE);
+ val &= ~HPET_CNF_ENABLE;
+ bus_write_4(sc->mem_res, HPET_CONFIG, val);
}
/* Discover the HPET via the ACPI table of the same name. */
OpenPOWER on IntegriCloud