From 55d300c11b87334615a81309158c696822c17453 Mon Sep 17 00:00:00 2001 From: Subrata Banik Date: Tue, 12 Jul 2022 11:06:15 +0000 Subject: [PATCH] cpu/x86: Allow SoC to select the `X2APIC_LATE_WORKAROUND` MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Intel Meteor Lake SoC expects to select late x2APIC enablement where AP bring up will use xAPIC and later x2APIC gets enabled using CPU init. This patch provides an option where SoC code choose the correct LAPIC access mode using choice selection. BUG=b:219061518, b:219053812 TEST=Able to build Google/Rex. Signed-off-by: Subrata Banik Change-Id: I6b50a0f5e39a95c25cd2c72219d2b402550a6fad Reviewed-on: https://review.coreboot.org/c/coreboot/+/65786 Reviewed-by: Kyösti Mälkki Reviewed-by: Angel Pons Tested-by: build bot (Jenkins) --- src/cpu/x86/Kconfig | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/src/cpu/x86/Kconfig b/src/cpu/x86/Kconfig index 1617ad6953..80b9a44c99 100644 --- a/src/cpu/x86/Kconfig +++ b/src/cpu/x86/Kconfig @@ -31,10 +31,16 @@ config DEFAULT_X2APIC_RUNTIME help Allow SoC code to set LAPIC_ACCESS_MODE to X2APIC_RUNTIME. +config DEFAULT_X2APIC_LATE_WORKAROUND + def_bool n + help + Allow SoC code to set LAPIC_ACCESS_MODE to X2APIC_LATE_WORKAROUND. + choice LAPIC_ACCESS_MODE prompt "APIC operation mode" default X2APIC_ONLY if DEFAULT_X2APIC default X2APIC_RUNTIME if DEFAULT_X2APIC_RUNTIME + default X2APIC_LATE_WORKAROUND if DEFAULT_X2APIC_LATE_WORKAROUND default XAPIC_ONLY config XAPIC_ONLY