Date: Wed, 19 Nov 2008 20:31:38 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r185103 - head/sys/dev/acpica Message-ID: <200811192031.mAJKVcj7027484@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: jkim Date: Wed Nov 19 20:31:38 2008 New Revision: 185103 URL: http://svn.freebsd.org/changeset/base/185103 Log: Make sure legacy replacement route is turned off when enbling HPET. Reviewed by: jhb Modified: head/sys/dev/acpica/acpi_hpet.c Modified: head/sys/dev/acpica/acpi_hpet.c ============================================================================== --- head/sys/dev/acpica/acpi_hpet.c Wed Nov 19 20:06:59 2008 (r185102) +++ head/sys/dev/acpica/acpi_hpet.c Wed Nov 19 20:31:38 2008 (r185103) @@ -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. */
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200811192031.mAJKVcj7027484>