Disable links after getting the possible resources. Even though _DIS

should only affect current resources, it seems best to wait until all
configuration is done before disabling it.  If this fixes any problems, it
is a MT5 candidate.

1 files changed, 12 insertions, 12 deletions

diff --git a/sys/dev/acpica/acpi_pci_link.c b/sys/dev/acpica/acpi_pci_link.c
index f2a15c8..7dd408b 100644
--- a/sys/dev/acpica/acpi_pci_link.c
+++ b/sys/dev/acpica/acpi_pci_link.c
@@ -373,18 +373,6 @@ acpi_pci_link_add_link(ACPI_HANDLE handle, struct acpi_prt_entry *entry)
 		link->initial_irq = 0;
 	}
 
-	/*
-	 * Try to disable this link.  If successful, set the current IRQ to
-	 * zero and flags to indicate this link is not routed.  If we can't
-	 * run _DIS (i.e., the method doesn't exist), assume the initial
-	 * IRQ was routed by the BIOS.
-	 */
-	if (ACPI_SUCCESS(AcpiEvaluateObject(handle, "_DIS", NULL, NULL))) {
-		link->current_irq = 0;
-		link->flags = ACPI_LINK_NONE;
-	} else
-		link->flags = ACPI_LINK_ROUTED;
-
 	error = AcpiGetPossibleResources(handle, &buf);
 	if (ACPI_FAILURE(error)) {
 		ACPI_DEBUG_PRINT((ACPI_DB_WARN,
@@ -426,6 +414,18 @@ acpi_pci_link_add_link(ACPI_HANDLE handle, struct acpi_prt_entry *entry)
 	}
 
 	/*
+	 * Try to disable this link.  If successful, set the current IRQ to
+	 * zero and flags to indicate this link is not routed.  If we can't
+	 * run _DIS (i.e., the method doesn't exist), assume the initial
+	 * IRQ was routed by the BIOS.
+	 */
+	if (ACPI_SUCCESS(AcpiEvaluateObject(handle, "_DIS", NULL, NULL))) {
+		link->current_irq = 0;
+		link->flags = ACPI_LINK_NONE;
+	} else
+		link->flags = ACPI_LINK_ROUTED;
+
+	/*
 	 * If the initial IRQ is invalid (not in _PRS), set it to 0 and
 	 * mark this link as not routed.  We won't use it as the preferred
 	 * interrupt later when we route.