Patrick Georgi has submitted this change. ( https://review.coreboot.org/c/coreboot/+/37048 )
Change subject: arch/x86/exception.c: Drop CAR_GLOBAL_MIGRATION support ......................................................................
arch/x86/exception.c: Drop CAR_GLOBAL_MIGRATION support
Change-Id: I9e0d62d45e5b11a0c2f0867633cde2378f305ec8 Signed-off-by: Arthur Heymans arthur@aheymans.xyz Reviewed-on: https://review.coreboot.org/c/coreboot/+/37048 Reviewed-by: HAOUAS Elyes ehaouas@noos.fr Reviewed-by: Patrick Georgi pgeorgi@google.com Tested-by: build bot (Jenkins) no-reply@coreboot.org --- M src/arch/x86/exception.c 1 file changed, 7 insertions(+), 10 deletions(-)
Approvals: build bot (Jenkins): Verified Patrick Georgi: Looks good to me, approved HAOUAS Elyes: Looks good to me, but someone else must approve
diff --git a/src/arch/x86/exception.c b/src/arch/x86/exception.c index b88f4a7..a599e79 100644 --- a/src/arch/x86/exception.c +++ b/src/arch/x86/exception.c @@ -12,7 +12,6 @@ */
#include <arch/cpu.h> -#include <arch/early_variables.h> #include <arch/exception.h> #include <commonlib/helpers.h> #include <console/console.h> @@ -569,7 +568,7 @@ (uintptr_t)vec16, (uintptr_t)vec17, (uintptr_t)vec18, (uintptr_t)vec19, };
-static struct intr_gate idt[ARRAY_SIZE(intr_entries)] __aligned(8) CAR_GLOBAL; +static struct intr_gate idt[ARRAY_SIZE(intr_entries)] __aligned(8);
static inline uint16_t get_cs(void) { @@ -620,21 +619,19 @@ { int i; uint16_t segment; - struct intr_gate *gates;
segment = get_cs(); - gates = car_get_var_ptr(idt);
/* Initialize IDT. */ for (i = 0; i < ARRAY_SIZE(idt); i++) { - gates[i].offset_0 = intr_entries[i]; - gates[i].segsel = segment; - gates[i].flags = IGATE_FLAGS; - gates[i].offset_1 = intr_entries[i] >> 16; + idt[i].offset_0 = intr_entries[i]; + idt[i].segsel = segment; + idt[i].flags = IGATE_FLAGS; + idt[i].offset_1 = intr_entries[i] >> 16; #if ENV_X86_64 - gates[i].offset_2 = intr_entries[i] >> 32; + idt[i].offset_2 = intr_entries[i] >> 32; #endif }
- load_idt(gates, sizeof(idt)); + load_idt(idt, sizeof(idt)); }