Module Name: src
Committed By: riz
Date: Thu Nov 22 00:34:44 UTC 2012
Modified Files:
src/sys/dev/acpi [netbsd-6-0]: acpi_pci_link.c
Log Message:
Pull up following revision(s) (requested by chs in ticket #682):
sys/dev/acpi/acpi_pci_link.c: revision 1.19
re-enable the code to disable link devices at startup, ie. revert rev 1.3.
this fixes PCI interrupts on some systems (eg. HP XW9400) and we suspect that
the problems which led to the original change were caused by buggy early
implementations of ACPI, which are now ignored by date.
To generate a diff of this commit:
cvs rdiff -u -r1.18 -r1.18.20.1 src/sys/dev/acpi/acpi_pci_link.c
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/sys/dev/acpi/acpi_pci_link.c
diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18 src/sys/dev/acpi/acpi_pci_link.c:1.18.20.1
--- src/sys/dev/acpi/acpi_pci_link.c:1.18 Fri Apr 23 15:52:26 2010
+++ src/sys/dev/acpi/acpi_pci_link.c Thu Nov 22 00:34:44 2012
@@ -1,4 +1,4 @@
-/* $NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $ */
+/* $NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $ */
/*-
* Copyright (c) 2002 Mitsuru IWASAKI <[email protected]>
@@ -27,7 +27,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18 2010/04/23 15:52:26 jruoho Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.20.1 2012/11/22 00:34:44 riz Exp $");
#include <sys/param.h>
#include <sys/malloc.h>
@@ -533,13 +533,11 @@ acpi_pci_link_attach(struct acpi_pci_lin
* run _DIS (i.e., the method doesn't exist), assume the initial
* IRQ was routed by the BIOS.
*/
-#if 0 /* XXX causes spontaneaous resets on some systems. Disabled for now. */
if (ACPI_SUCCESS(AcpiEvaluateObject(sc->pl_handle, "_DIS", NULL,
NULL)))
for (i = 0; i < sc->pl_num_links; i++)
sc->pl_links[i].l_irq = PCI_INVALID_IRQ;
else
-#endif
for (i = 0; i < sc->pl_num_links; i++)
if (PCI_INTERRUPT_VALID(sc->pl_links[i].l_irq))
sc->pl_links[i].l_routed = TRUE;
