diff options
| author | Marco Peereboom <marco@cvs.openbsd.org> | 2007-11-18 17:27:51 +0000 |
|---|---|---|
| committer | Marco Peereboom <marco@cvs.openbsd.org> | 2007-11-18 17:27:51 +0000 |
| commit | 0002b12aff4753fec661ccc9e71178e0039ede32 (patch) | |
| tree | d61d998882abefe2094ce57a5644087fbbc3f287 /sys/dev/acpi | |
| parent | 646b08167eea1d425c76dacc8d62033c479930f6 (diff) | |
Fix for PR 5642 & 5643. Report and testing Martijn Rijkeboer
<martijn at bunix dot org>
ok deraadt kettenis
Diffstat (limited to 'sys/dev/acpi')
| -rw-r--r-- | sys/dev/acpi/acpihpet.c | 24 |
1 files changed, 22 insertions, 2 deletions
diff --git a/sys/dev/acpi/acpihpet.c b/sys/dev/acpi/acpihpet.c index 8b6ea286b2d..28a9a81dbc0 100644 --- a/sys/dev/acpi/acpihpet.c +++ b/sys/dev/acpi/acpihpet.c @@ -1,4 +1,4 @@ -/* $OpenBSD: acpihpet.c,v 1.4 2007/02/20 23:54:46 marco Exp $ */ +/* $OpenBSD: acpihpet.c,v 1.5 2007/11/18 17:27:50 marco Exp $ */ /* * Copyright (c) 2005 Thorsten Lockert <tholo@sigmasoft.com> * @@ -90,6 +90,7 @@ acpihpet_attach(struct device *parent, struct device *self, void *aux) struct acpi_attach_args *aaa = aux; struct acpi_hpet *hpet = (struct acpi_hpet *)aaa->aaa_table; u_int64_t period, freq; /* timer period in femtoseconds (10^-15) */ + u_int32_t v1, v2; if (acpi_map_address(psc, &hpet->base_address, 0, HPET_REG_SIZE, &sc->sc_ioh, &sc->sc_iot)) { @@ -97,8 +98,28 @@ acpihpet_attach(struct device *parent, struct device *self, void *aux) return; } + /* enable hpet */ + bus_space_write_4(sc->sc_iot, sc->sc_ioh, HPET_CONFIGURATION, 1); + + /* make sure hpet is working */ + v1 = bus_space_read_4(sc->sc_iot, sc->sc_ioh, HPET_MAIN_COUNTER); + delay(1); + v2 = bus_space_read_4(sc->sc_iot, sc->sc_ioh, HPET_MAIN_COUNTER); + if (v1 == v2) { + printf(": counter not incrementing\n"); + bus_space_write_4(sc->sc_iot, sc->sc_ioh, + HPET_CONFIGURATION, 0); + return; + } + period = bus_space_read_4(sc->sc_iot, sc->sc_ioh, HPET_CAPABILITIES + sizeof(u_int32_t)); + if (period == 0) { + printf(": invalid period\n"); + bus_space_write_4(sc->sc_iot, sc->sc_ioh, + HPET_CONFIGURATION, 0); + return; + } freq = 1000000000000000ull / period; printf(": %lld Hz\n", freq); @@ -106,7 +127,6 @@ acpihpet_attach(struct device *parent, struct device *self, void *aux) hpet_timecounter.tc_frequency = (u_int32_t)freq; hpet_timecounter.tc_priv = sc; hpet_timecounter.tc_name = sc->sc_dev.dv_xname; - bus_space_write_4(sc->sc_iot, sc->sc_ioh, HPET_CONFIGURATION, 1); tc_init(&hpet_timecounter); #endif } |