From 6957c423f155cd4a6017a3e8769bba15735a2a66 Mon Sep 17 00:00:00 2001 From: Matthew Dillon Date: Sun, 16 Dec 2018 13:26:06 -0800 Subject: [PATCH] atkbdc - Change default to still attach PS2 controller even if FADT says don't * Temporary workaround, disable commit 131acb0380e93664 by default. It can be enabled again with a tunable in /boot/loader.conf: hw.acpi.fadt_8042_nolegacy=1 * Should work around several bug reports of the keyboard not working in 5.4. --- sys/platform/pc64/acpica/acpi_fadt.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/sys/platform/pc64/acpica/acpi_fadt.c b/sys/platform/pc64/acpica/acpi_fadt.c index ca60bc16a3..bbb15b09ec 100644 --- a/sys/platform/pc64/acpica/acpi_fadt.c +++ b/sys/platform/pc64/acpica/acpi_fadt.c @@ -74,8 +74,14 @@ static const struct acpi_sci_mode acpi_sci_modes[] = { { INTR_TRIGGER_CONFORM, INTR_POLARITY_CONFORM } }; -/* Defaulting to 1, to stop atkbdc from being configured early, via cninit() */ -int acpi_fadt_8042_nolegacy = 1; +/* + * Set to 1 to stop atkbdc from being configured early, via cninit(). + * + * Currently set to 0 because this is causing problems for several + * people. Can be set to 1 with a tunable. + */ +int acpi_fadt_8042_nolegacy = 0; +TUNABLE_INT("hw.acpi.fadt_8042_nolegacy", &acpi_fadt_8042_nolegacy); static void fadt_probe(void) -- 2.41.0