Module Name: src
Committed By: jmcneill
Date: Fri Oct 15 18:44:53 UTC 2021
Modified Files:
src/sys/arch/x86/isa: isa_machdep.c
Log Message:
If ACPI indicates that there are no user visible devices on the LPC or ISA
bus, set the "no-legacy-devices" property on isa to bypass indirect
configuration of ISA devices.
To generate a diff of this commit:
cvs rdiff -u -r1.46 -r1.47 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.46 src/sys/arch/x86/isa/isa_machdep.c:1.47
--- src/sys/arch/x86/isa/isa_machdep.c:1.46 Sat May 2 16:44:35 2020
+++ src/sys/arch/x86/isa/isa_machdep.c Fri Oct 15 18:44:53 2021
@@ -1,4 +1,4 @@
-/* $NetBSD: isa_machdep.c,v 1.46 2020/05/02 16:44:35 bouyer Exp $ */
+/* $NetBSD: isa_machdep.c,v 1.47 2021/10/15 18:44:53 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.46 2020/05/02 16:44:35 bouyer Exp $");
+__KERNEL_RCSID(0, "$NetBSD: isa_machdep.c,v 1.47 2021/10/15 18:44:53 jmcneill Exp $");
#include <sys/param.h>
#include <sys/systm.h>
@@ -369,13 +369,20 @@ device_isa_register(device_t dev, void *
prop_dictionary_set_bool(device_properties(dev),
"no-legacy-devices", true);
#if NACPICA > 0
-#if notyet
if (device_is_a(dev, "isa") && acpi_active) {
- if (!(AcpiGbl_FADT.BootFlags & ACPI_FADT_LEGACY_DEVICES))
+ /*
+ * For FACP >= 2, the LEGACY_DEVICES flag indicates that
+ * the motherboard supports user-visible devices on the LPC
+ * or ISA bus. If clear, assume that no such devices are
+ * present and we can enumerate everything we need using
+ * ACPI tables.
+ */
+ if (AcpiGbl_FADT.Header.Revision >= 2 &&
+ !(AcpiGbl_FADT.BootFlags & ACPI_FADT_LEGACY_DEVICES)) {
prop_dictionary_set_bool(device_properties(dev),
"no-legacy-devices", true);
+ }
}
-#endif
#endif /* NACPICA > 0 */
return NULL;
}
