mirror of
https://github.com/fail0verflow/switch-coreboot.git
synced 2025-05-04 01:39:18 -04:00
UPSTREAM: intel/skylake: Disable FADT.8042 if NO_FADT_8042 is set
Kernel relies on FADT 8042 flag to enable/disable
8042 interface. If FADT reports 8042 capability and
8042 (/PS2) capability is actually disabled by coreboot,
kernel would assume the presence of 8042 based on the
FADT flag. This results in undesired system power off when
kernel tries to access the 8042 memory region. To address
this, CONFIG_NO_FADT_8042 was added to selectively
disable 8042 on FADT.
BUG=chrome-os-partner:61858
TEST=Boot OS and verify FADT 8042 flag
Change-Id: I45e667950850209b33531dbb7ed784f073648e69
Signed-off-by: Furquan Shaikh <furquan@chromium.org>
Original-Commit-Id: 2864f85725
Original-Change-Id: Ic80b3835cb5cccdde1203e24a58e28746b0196fc
Original-Signed-off-by: Jenny TC <jenny.tc@intel.com>
Original-Reviewed-on: https://review.coreboot.org/18307
Original-Tested-by: build bot (Jenkins)
Original-Reviewed-by: Furquan Shaikh <furquan@google.com>
Reviewed-on: https://chromium-review.googlesource.com/443672
Commit-Ready: Jenny Tc <jenny.tc@intel.com>
This commit is contained in:
parent
c0ecc31093
commit
ff0f7a7a9a
2 changed files with 9 additions and 1 deletions
|
@ -242,4 +242,10 @@ config MAX_ROOT_PORTS
|
|||
default 24 if PLATFORM_USES_FSP2_0
|
||||
default 20 if PLATFORM_USES_FSP1_1
|
||||
|
||||
config NO_FADT_8042
|
||||
bool
|
||||
default n
|
||||
help
|
||||
Choose this option if you want to disable 8042 Keyboard
|
||||
|
||||
endif
|
||||
|
|
|
@ -268,7 +268,9 @@ void acpi_fill_fadt(acpi_fadt_t *fadt)
|
|||
fadt->day_alrm = 0xd;
|
||||
fadt->mon_alrm = 0x00;
|
||||
fadt->century = 0x00;
|
||||
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES | ACPI_FADT_8042;
|
||||
fadt->iapc_boot_arch = ACPI_FADT_LEGACY_DEVICES;
|
||||
if (!IS_ENABLED(CONFIG_NO_FADT_8042))
|
||||
fadt->iapc_boot_arch |= ACPI_FADT_8042;
|
||||
|
||||
fadt->flags = ACPI_FADT_WBINVD | ACPI_FADT_C1_SUPPORTED |
|
||||
ACPI_FADT_C2_MP_SUPPORTED | ACPI_FADT_SLEEP_BUTTON |
|
||||
|
|
Loading…
Add table
Reference in a new issue