diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 12:30:31 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-12-12 12:30:31 -0800 |
| commit | 369013162f7a7aed9e685e4763c3395700e909ad (patch) | |
| tree | fcf8e490e545651d6e2c8966f704d14f823a9e5f /arch/x86/Kconfig | |
| parent | 08d72bd299d08ae019a8a999b95f3e72643a11a4 (diff) | |
| parent | 2833275568755eb937a52c358bf8bfa7125a463e (diff) | |
Merge tag 'x86-apic-2022-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip
Pull x86 apic update from Thomas Gleixner:
"A set of changes for the x86 APIC code:
- Handle the case where x2APIC is enabled and locked by the BIOS on a
kernel with CONFIG_X86_X2APIC=n gracefully.
Instead of a panic which does not make it to the graphical console
during very early boot, simply disable the local APIC completely
and boot with the PIC and very limited functionality, which allows
to diagnose the issue
- Convert x86 APIC device tree bindings to YAML
- Extend x86 APIC device tree bindings to configure interrupt
delivery mode and handle this in during init. This allows to boot
with device tree on platforms which lack a legacy PIC"
* tag 'x86-apic-2022-12-10' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
x86/of: Add support for boot time interrupt delivery mode configuration
x86/of: Replace printk(KERN_LVL) with pr_lvl()
dt-bindings: x86: apic: Introduce new optional bool property for lapic
dt-bindings: x86: apic: Convert Intel's APIC bindings to YAML schema
x86/of: Remove unused early_init_dt_add_memory_arch()
x86/apic: Handle no CONFIG_X86_X2APIC on systems with x2APIC enabled by BIOS
Diffstat (limited to 'arch/x86/Kconfig')
| -rw-r--r-- | arch/x86/Kconfig | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/x86/Kconfig b/arch/x86/Kconfig index e2eebb193ee0..68a2a04c02e5 100644 --- a/arch/x86/Kconfig +++ b/arch/x86/Kconfig @@ -463,8 +463,8 @@ config X86_X2APIC Some Intel systems circa 2022 and later are locked into x2APIC mode and can not fall back to the legacy APIC modes if SGX or TDX are - enabled in the BIOS. They will be unable to boot without enabling - this option. + enabled in the BIOS. They will boot with very reduced functionality + without enabling this option. If you don't know what to do here, say N. |