Module Name: src
Committed By: jmcneill
Date: Fri Apr 15 17:53:44 UTC 2022
Modified Files:
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
Disable FADT LEGACY_DEVICES flag test.
This test had the unintended side-effect of blocking the lm(4) driver
from attaching on more than one system. Go back to (slow) probing of
ISA devices for now to restore existing functionality.
To generate a diff of this commit:
cvs rdiff -u -r1.51 -r1.52 src/sys/arch/x86/isa/isa_machdep.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/arch/x86/isa/isa_machdep.c
diff -u src/sys/arch/x86/isa/isa_machdep.c:1.51 src/sys/arch/x86/isa/isa_machdep.c:1.52
--- src/sys/arch/x86/isa/isa_machdep.c:1.51 Fri Dec 17 06:28:20 2021
+++ src/sys/arch/x86/isa/isa_machdep.c Fri Apr 15 17:53:44 2022
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.51 2021/12/17 06:28:20 skrll Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.52 2022/04/15 17:53:44 jmcneill Exp $ */
/*-
* Copyright (c) 1996, 1997, 1998 The NetBSD Foundation, Inc.
@@ -65,7 +65,7 @@
*/
#include <sys/cdefs.h>
-__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.51 2021/12/17 06:28:20 skrll Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.52 2022/04/15 17:53:44 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -373,6 +373,13 @@ device_isa_register(device_t dev, void *
prop_dictionary_set_bool(device_properties(dev),
"no-legacy-devices", true);
#if NACPICA > 0
+#if notyet
+ /*
+ * The following code block is technically correct, but unfortunately
+ * it breaks things like being able to use lm(4) on platforms that
+ * have no other means of exposing temperature, fan, and voltage
+ * sensors.
+ */
if (device_is_a(dev, "isa") && acpi_active) {
/*
* For FACP >= 2, the LEGACY_DEVICES flag indicates that
@@ -387,6 +394,8 @@ device_isa_register(device_t dev, void *
"no-legacy-devices", true);
}
}
+#endif
+
if (vm_guest == VM_GUEST_VMWARE &&
device_is_a(dev, "isa") && acpi_active) {
prop_dictionary_set_bool(device_properties(dev),
