This allows sharing IDT setup code between EFI (-fPIC) and
non-EFI builds.
Signed-off-by: Varad Gautam <varad.gautam@xxxxxxxx>
---
lib/x86/desc.c | 5 +++++
lib/x86/desc.h | 1 +
lib/x86/setup.c | 1 -
x86/cstart64.S | 3 ++-
x86/efi/efistart64.S | 5 -----
5 files changed, 8 insertions(+), 7 deletions(-)
diff --git a/lib/x86/desc.c b/lib/x86/desc.c
index 0677fcd..087e85c 100644
--- a/lib/x86/desc.c
+++ b/lib/x86/desc.c
@@ -294,6 +294,11 @@ void setup_idt(void)
handle_exception(13, check_exception_table);
}
+void load_idt(void)
+{
+ lidt(&idt_descr);
+}
+
unsigned exception_vector(void)
{
return this_cpu_read_exception_vector();
diff --git a/lib/x86/desc.h b/lib/x86/desc.h
index 5224b58..3044409 100644
--- a/lib/x86/desc.h
+++ b/lib/x86/desc.h
@@ -4,6 +4,7 @@
#include <setjmp.h>
void setup_idt(void);
+void load_idt(void);
void setup_alt_stack(void);
struct ex_regs {
diff --git a/lib/x86/setup.c b/lib/x86/setup.c
index 86ba6de..94e9f86 100644
--- a/lib/x86/setup.c
+++ b/lib/x86/setup.c
@@ -170,7 +170,6 @@ void setup_multiboot(struct mbi_bootinfo *bi)
#ifdef CONFIG_EFI
/* From x86/efi/efistart64.S */
-extern void load_idt(void);
extern void load_gdt_tss(size_t tss_offset);
static efi_status_t setup_memory_allocator(efi_bootinfo_t *efi_bootinfo)
diff --git a/x86/cstart64.S b/x86/cstart64.S
index f371d06..30012ca 100644
--- a/x86/cstart64.S
+++ b/x86/cstart64.S
@@ -66,7 +66,6 @@ MSR_GS_BASE = 0xc0000101
.endm
.macro load_tss
- lidtq idt_descr
movq %rsp, %rdi
call setup_tss
ltr %ax
@@ -191,6 +190,7 @@ save_id:
ap_start64:
call reset_apic
+ call load_idt
load_tss
call enable_apic
call save_id
@@ -204,6 +204,7 @@ ap_start64:
start64:
call reset_apic
+ call load_idt
load_tss
call mask_pic_interrupts
call enable_apic
diff --git a/x86/efi/efistart64.S b/x86/efi/efistart64.S
index 0425153..ea3d1c0 100644
--- a/x86/efi/efistart64.S
+++ b/x86/efi/efistart64.S
@@ -26,11 +26,6 @@ ptl4:
.code64
.text
-.globl load_idt
-load_idt:
- lidtq idt_descr(%rip)
- retq
-
.globl load_gdt_tss
load_gdt_tss:
/* Load GDT */
--
2.35.1
