svn commit: r233162 - stable/9/sys/dev/acpica

[Alexander Motin]

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.