Disable devices that are not present; at a later stage we can then enable

them if the device arrives.

This should solve the problem where devices that have been disabled eg. in
the BIOS show up with nonsense resources and hang the bootstrap process.

1 files changed, 10 insertions, 0 deletions

diff --git a/sys/dev/acpica/acpi.c b/sys/dev/acpica/acpi.c
index 3edd3f8..e5c1194 100644
--- a/sys/dev/acpica/acpi.c
+++ b/sys/dev/acpica/acpi.c
@@ -786,6 +786,16 @@ acpi_probe_child(ACPI_HANDLE handle, UINT32 level, void *context, void **status)
 	    acpi_set_handle(child, handle);
 
 	    /*
+	     * Check that the device is present.  If it's not present,
+	     * leave it disabled (so that we have a device_t attached to
+	     * the handle, but we don't probe it).
+	     */
+	    if (!acpi_DeviceIsPresent(child)) {
+		device_disable(child);
+		break;
+	    }
+
+	    /*
 	     * Get the device's resource settings and attach them.
 	     * Note that if the device has _PRS but no _CRS, we need
 	     * to decide when it's appropriate to try to configure the