svn commit: r187574 - in stable/7/sys: . contrib/pf dev/acpica dev/ath/ath_hal dev/cxgb

[Jung-uk Kim]

Author: jkim
Date: Wed Jan 21 21:31:44 2009
New Revision: 187574
URL: http://svn.freebsd.org/changeset/base/187574

Log:
  MFC: Make sure legacy replacement route is turned off when enbling HPET.

Modified:
  stable/7/sys/   (props changed)
  stable/7/sys/contrib/pf/   (props changed)
  stable/7/sys/dev/acpica/acpi_hpet.c
  stable/7/sys/dev/ath/ath_hal/   (props changed)
  stable/7/sys/dev/cxgb/   (props changed)

Modified: stable/7/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- stable/7/sys/dev/acpica/acpi_hpet.c	Wed Jan 21 21:29:00 2009	(r187573)
+++ stable/7/sys/dev/acpica/acpi_hpet.c	Wed Jan 21 21:31:44 2009	(r187574)
@@ -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. */