[src/netbsd-6]: src Back out ticket #682; it's causing some systems to fail ...

[riz <riz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/0a8564d74407
branches:  netbsd-6
changeset: 775558:0a8564d74407
user:      riz <riz%NetBSD.org@localhost>
date:      Mon Dec 10 18:27:00 2012 +0000

description:
Back out ticket #682;  it's causing some systems to fail to boot.

diffstat:

 doc/CHANGES-6.1              |  7 +------
 sys/dev/acpi/acpi_pci_link.c |  6 ++++--
 2 files changed, 5 insertions(+), 8 deletions(-)

diffs (53 lines):

diff -r 567dabf12e71 -r 0a8564d74407 doc/CHANGES-6.1
--- a/doc/CHANGES-6.1   Mon Dec 03 19:07:26 2012 +0000
+++ b/doc/CHANGES-6.1   Mon Dec 10 18:27:00 2012 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: CHANGES-6.1,v 1.1.2.53 2012/12/03 04:54:49 riz Exp $
+# $NetBSD: CHANGES-6.1,v 1.1.2.54 2012/12/10 18:27:00 riz Exp $
 
 A complete list of changes from the 6.0 release until the 6.1 release:
 
@@ -789,11 +789,6 @@
        This driver is based on the MI dp8390 backend.
        [phx, ticket #681]
 
-sys/dev/acpi/acpi_pci_link.c                   1.19
-
-       Fix PCI interrupts on some systems.
-       [chs, ticket #682]
-
 sys/arch/ia64/acpi/acpi_machdep.c              1.6
 sys/arch/ia64/include/acpi_machdep.h           1.6
 sys/arch/x86/acpi/acpi_machdep.c               1.4
diff -r 567dabf12e71 -r 0a8564d74407 sys/dev/acpi/acpi_pci_link.c
--- a/sys/dev/acpi/acpi_pci_link.c      Mon Dec 03 19:07:26 2012 +0000
+++ b/sys/dev/acpi/acpi_pci_link.c      Mon Dec 10 18:27:00 2012 +0000
@@ -1,4 +1,4 @@
-/*     $NetBSD: acpi_pci_link.c,v 1.18.14.1 2012/11/22 00:34:25 riz Exp $      */
+/*     $NetBSD: acpi_pci_link.c,v 1.18.14.2 2012/12/10 18:27:01 riz Exp $      */
 
 /*-
  * Copyright (c) 2002 Mitsuru IWASAKI <iwasaki%jp.freebsd.org@localhost>
@@ -27,7 +27,7 @@
  */
 
 #include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.14.1 2012/11/22 00:34:25 riz Exp $");
+__KERNEL_RCSID(0, "$NetBSD: acpi_pci_link.c,v 1.18.14.2 2012/12/10 18:27:01 riz Exp $");
 
 #include <sys/param.h>
 #include <sys/malloc.h>
@@ -533,11 +533,13 @@
         * 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;