From owner-svn-src-head@FreeBSD.ORG  Thu Sep 30 16:23:01 2010
Return-Path: <owner-svn-src-head@FreeBSD.ORG>
Delivered-To: svn-src-head@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id B3827106566B;
	Thu, 30 Sep 2010 16:23:01 +0000 (UTC) (envelope-from mav@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:4f8:fff6::2c])
	by mx1.freebsd.org (Postfix) with ESMTP id A40C08FC12;
	Thu, 30 Sep 2010 16:23:01 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.3/8.14.3) with ESMTP id o8UGN1Eh074635;
	Thu, 30 Sep 2010 16:23:01 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.3/8.14.3/Submit) id o8UGN1Zu074633;
	Thu, 30 Sep 2010 16:23:01 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201009301623.o8UGN1Zu074633@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Thu, 30 Sep 2010 16:23:01 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-head@freebsd.org
X-SVN-Group: head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r213302 - head/sys/dev/acpica
X-BeenThere: svn-src-head@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: SVN commit messages for the src tree for head/-current
	<svn-src-head.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-head>
List-Post: <mailto:svn-src-head@freebsd.org>
List-Help: <mailto:svn-src-head-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-head>,
	<mailto:svn-src-head-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Thu, 30 Sep 2010 16:23:01 -0000

Author: mav
Date: Thu Sep 30 16:23:01 2010
New Revision: 213302
URL: http://svn.freebsd.org/changeset/base/213302

Log:
  Do not use regular interrupts on NVidia HPETs. NVidia MCP5x chipsets have
  number of unexplained interrupt problems. For some reason, using HPET
  interrupts there breaks HDA sound. Legacy route mode interrupts reported
  to work fine there.

Modified:
  head/sys/dev/acpica/acpi_hpet.c

Modified: head/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- head/sys/dev/acpica/acpi_hpet.c	Thu Sep 30 16:09:52 2010	(r213301)
+++ head/sys/dev/acpica/acpi_hpet.c	Thu Sep 30 16:23:01 2010	(r213302)
@@ -58,6 +58,7 @@ __FBSDID("$FreeBSD$");
 
 #define HPET_VENDID_AMD		0x4353
 #define HPET_VENDID_INTEL	0x8086
+#define HPET_VENDID_NVIDIA	0x10de
 
 ACPI_SERIAL_DECL(hpet, "ACPI HPET support");
 
@@ -492,6 +493,12 @@ hpet_attach(device_t dev)
 	if (vendor == HPET_VENDID_AMD)
 		sc->allowed_irqs = 0x00000000;
 	/*
+	 * NVidia MCP5x chipsets have number of unexplained interrupt
+	 * problems. For some reason, using HPET interrupts breaks HDA sound.
+	 */
+	if (vendor == HPET_VENDID_NVIDIA && rev <= 0x01)
+		sc->allowed_irqs = 0x00000000;
+	/*
 	 * Neither QEMU nor VirtualBox report supported IRQs correctly.
 	 * The only way to use HPET there is to specify IRQs manually
 	 * and/or use legacy_route. Legacy_route mode work on both.