From owner-svn-src-stable@FreeBSD.ORG  Wed Jan 21 21:31:44 2009
Return-Path: <owner-svn-src-stable@FreeBSD.ORG>
Delivered-To: svn-src-stable@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id D14121065678;
	Wed, 21 Jan 2009 21:31:44 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id BE5218FC1A;
	Wed, 21 Jan 2009 21:31:44 +0000 (UTC)
	(envelope-from jkim@FreeBSD.org)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id n0LLVi2s091993;
	Wed, 21 Jan 2009 21:31:44 GMT (envelope-from jkim@svn.freebsd.org)
Received: (from jkim@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id n0LLViIo091992;
	Wed, 21 Jan 2009 21:31:44 GMT (envelope-from jkim@svn.freebsd.org)
Message-Id: <200901212131.n0LLViIo091992@svn.freebsd.org>
From: Jung-uk Kim <jkim@FreeBSD.org>
Date: Wed, 21 Jan 2009 21:31:44 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-7@freebsd.org
X-SVN-Group: stable-7
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r187574 - in stable/7/sys: . contrib/pf dev/acpica
	dev/ath/ath_hal dev/cxgb
X-BeenThere: svn-src-stable@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for all the -stable branches of the src tree
	<svn-src-stable.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>, 
	<mailto:svn-src-stable-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-stable>
List-Post: <mailto:svn-src-stable@freebsd.org>
List-Help: <mailto:svn-src-stable-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-stable>,
	<mailto:svn-src-stable-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 21 Jan 2009 21:31:46 -0000

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. */