Module Name: src
Committed By: riz
Date: Mon Dec 10 18:27:01 UTC 2012
Modified Files:
src/doc [netbsd-6]: CHANGES-6.1
src/sys/dev/acpi [netbsd-6]: acpi_pci_link.c
Log Message:
Back out ticket #682; it's causing some systems to fail to boot.
To generate a diff of this commit:
cvs rdiff -u -r1.1.2.53 -r1.1.2.54 src/doc/CHANGES-6.1
cvs rdiff -u -r1.18.14.1 -r1.18.14.2 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/doc/CHANGES-6.1
diff -u src/doc/CHANGES-6.1:1.1.2.53 src/doc/CHANGES-6.1:1.1.2.54
--- src/doc/CHANGES-6.1:1.1.2.53 Mon Dec 3 04:54:49 2012
+++ src/doc/CHANGES-6.1 Mon Dec 10 18:27:00 2012
@@ -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 @@ sys/dev/ic/dp8390reg.h 1.9
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
Index: src/sys/dev/acpi/acpi_pci_link.c
diff -u src/sys/dev/acpi/acpi_pci_link.c:1.18.14.1 src/sys/dev/acpi/acpi_pci_link.c:1.18.14.2
--- src/sys/dev/acpi/acpi_pci_link.c:1.18.14.1 Thu Nov 22 00:34:25 2012
+++ src/sys/dev/acpi/acpi_pci_link.c Mon Dec 10 18:27:01 2012
@@ -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 <iwas...@jp.freebsd.org>
@@ -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 @@ 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;
