From owner-svn-src-stable@FreeBSD.ORG  Mon Mar 19 07:13:31 2012
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 2A540106564A;
	Mon, 19 Mar 2012 07:13:31 +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 15EE68FC17;
	Mon, 19 Mar 2012 07:13:31 +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 q2J7DUMo056321;
	Mon, 19 Mar 2012 07:13:30 GMT (envelope-from mav@svn.freebsd.org)
Received: (from mav@localhost)
	by svn.freebsd.org (8.14.4/8.14.4/Submit) id q2J7DUwJ056319;
	Mon, 19 Mar 2012 07:13:30 GMT (envelope-from mav@svn.freebsd.org)
Message-Id: <201203190713.q2J7DUwJ056319@svn.freebsd.org>
From: Alexander Motin <mav@FreeBSD.org>
Date: Mon, 19 Mar 2012 07:13:30 +0000 (UTC)
To: src-committers@freebsd.org, svn-src-all@freebsd.org,
	svn-src-stable@freebsd.org, svn-src-stable-9@freebsd.org
X-SVN-Group: stable-9
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
Cc: 
Subject: svn commit: r233162 - stable/9/sys/dev/acpica
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: Mon, 19 Mar 2012 07:13:31 -0000

Author: mav
Date: Mon Mar 19 07:13:30 2012
New Revision: 233162
URL: http://svn.freebsd.org/changeset/base/233162

Log:
  MFC r232797:
  ServerWorks HT1000 HPET reported to have problems with IRQs >= 16.
  Lower (ISA) IRQs are working, but allowed mask is not set correctly.
  Block both by default to allow HP BL465c G6 blade system to boot.

Modified:
  stable/9/sys/dev/acpica/acpi_hpet.c
Directory Properties:
  stable/9/sys/   (props changed)

Modified: stable/9/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_hpet.c	Mon Mar 19 05:08:09 2012	(r233161)
+++ stable/9/sys/dev/acpica/acpi_hpet.c	Mon Mar 19 07:13:30 2012	(r233162)
@@ -59,6 +59,7 @@ __FBSDID("$FreeBSD$");
 #define HPET_VENDID_AMD		0x4353
 #define HPET_VENDID_INTEL	0x8086
 #define HPET_VENDID_NVIDIA	0x10de
+#define HPET_VENDID_SW		0x1166
 
 ACPI_SERIAL_DECL(hpet, "ACPI HPET support");
 
@@ -513,6 +514,13 @@ hpet_attach(device_t dev)
 	if (vendor == HPET_VENDID_NVIDIA && rev <= 0x01)
 		sc->allowed_irqs = 0x00000000;
 	/*
+	 * ServerWorks HT1000 reported to have problems with IRQs >= 16.
+	 * Lower IRQs are working, but allowed mask is not set correctly.
+	 * Legacy_route mode works fine.
+	 */
+	if (vendor == HPET_VENDID_SW && 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 works on both.