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

[Alexander Motin]

Author: mav
Date: Wed Sep 12 09:29:22 2012
New Revision: 240384
URL: http://svn.freebsd.org/changeset/base/240384

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

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

Modified: stable/9/sys/dev/acpica/acpi_hpet.c
==============================================================================
--- stable/9/sys/dev/acpica/acpi_hpet.c	Wed Sep 12 09:20:37 2012	(r240383)
+++ stable/9/sys/dev/acpica/acpi_hpet.c	Wed Sep 12 09:29:22 2012	(r240384)
@@ -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