From owner-svn-src-all@FreeBSD.ORG  Wed Sep 12 10:53:09 2012
Return-Path: <owner-svn-src-all@FreeBSD.ORG>
Delivered-To: svn-src-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:4f8:fff6::34])
	by hub.freebsd.org (Postfix) with ESMTP id 7B01F106564A;
	Wed, 12 Sep 2012 10:53:09 +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 66F008FC12;
	Wed, 12 Sep 2012 10:53:09 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
	by svn.freebsd.org (8.14.4/8.14.4) with ESMTP id q8CAr9vI052691;
	Wed, 12 Sep 2012 10:53:09 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q8CAr9O4052689;
	Wed, 12 Sep 2012 10:53:09 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201209121053.q8CAr9O4052689@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Wed, 12 Sep 2012 10:53:09 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-releng@freebsd.org
X-SVN-Group: releng
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r240390 - releng/9.1/sys/dev/acpica
X-BeenThere: svn-src-all@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: "SVN commit messages for the entire src tree \(except for &quot;
	user&quot; and &quot; projects&quot; \)" <svn-src-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-src-all>
List-Post: <mailto:svn-src-all@freebsd.org>
List-Help: <mailto:svn-src-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-src-all>,
	<mailto:svn-src-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Wed, 12 Sep 2012 10:53:09 -0000

Author: mav
Date: Wed Sep 12 10:53:08 2012
New Revision: 240390
URL: http://svn.freebsd.org/changeset/base/240390

Log:
  MFC r240286:
  At least from A70M FCH chipsets AMD started to use their real vendor ID
  (1022) in HPET. But according to report they still haven't fixed problem
  with level-triggered interrupts.
  Make workaround used for earlier chipsets apply to this new ID also.
  
  PR:		amd64/171355
  Approved by:	re (kib)

Modified:
  releng/9.1/sys/dev/acpica/acpi_hpet.c
Directory Properties:
  releng/9.1/sys/   (props changed)
  releng/9.1/sys/dev/   (props changed)

Modified: releng/9.1/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- releng/9.1/sys/dev/acpica/acpi_hpet.c	Wed Sep 12 10:39:47 2012	(r240389)
+++ releng/9.1/sys/dev/acpica/acpi_hpet.c	Wed Sep 12 10:53:08 2012	(r240390)
@@ -57,6 +57,7 @@ __FBSDID("$FreeBSD$");
 #endif
 
 #define HPET_VENDID_AMD		0x4353
+#define HPET_VENDID_AMD2	0x1022
 #define HPET_VENDID_INTEL	0x8086
 #define HPET_VENDID_NVIDIA	0x10de
 #define HPET_VENDID_SW		0x1166
@@ -505,7 +506,7 @@ hpet_attach(device_t dev)
 	 * properly, that makes it very unreliable - it freezes after any
 	 * interrupt loss. Avoid legacy IRQs for AMD.
 	 */
-	if (vendor == HPET_VENDID_AMD)
+	if (vendor == HPET_VENDID_AMD || vendor == HPET_VENDID_AMD2)
 		sc->allowed_irqs = 0x00000000;
 	/*
 	 * NVidia MCP5x chipsets have number of unexplained interrupt