summaryrefslogtreecommitdiff
path: root/src/cpu/x86
diff options
context:
space:
mode:
authorPatrick Rudolph <patrick.rudolph@9elements.com>2020-08-24 11:34:47 +0200
committerPatrick Georgi <pgeorgi@google.com>2020-08-24 11:35:31 +0000
commit0fc1f2fb6f85f1c3d5fc911520c1e92f9db02469 (patch)
treece103c56b2e1a0c7b2644c08ace75f35a57647ff /src/cpu/x86
parentdda2de81c74d7cd37c871b525cdd1a00b87ca496 (diff)
downloadcoreboot-0fc1f2fb6f85f1c3d5fc911520c1e92f9db02469.tar.xz
Revert "cpu/x86/sipi: Add x86_64 support"
This reverts commit 18ad7fa51f5c6560c9d7a9bcf68e9e277e37cd49. Breaks Mpinit. The log shows: SIPI module has no parameters. MP initialization failure. Change-Id: Ideed19437667124a02c0f03aa7be8dec042d0f44 Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/44734 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Reviewed-by: Nico Huber <nico.h@gmx.de> Reviewed-by: Angel Pons <th3fanbus@gmail.com> Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Diffstat (limited to 'src/cpu/x86')
-rw-r--r--src/cpu/x86/64bit/entry64.inc10
-rw-r--r--src/cpu/x86/Makefile.inc1
-rw-r--r--src/cpu/x86/sipi_vector.S13
3 files changed, 0 insertions, 24 deletions
diff --git a/src/cpu/x86/64bit/entry64.inc b/src/cpu/x86/64bit/entry64.inc
index 70255173f1..65c0fdc929 100644
--- a/src/cpu/x86/64bit/entry64.inc
+++ b/src/cpu/x86/64bit/entry64.inc
@@ -16,12 +16,7 @@
#endif
#include <cpu/x86/msr.h>
-#if defined(__RAMSTAGE__)
-#include <arch/ram_segs.h>
-#else
#include <arch/rom_segs.h>
-#endif
-
setup_longmode:
/* Get page table address */
@@ -47,12 +42,7 @@ setup_longmode:
movl %eax, %cr0
/* use long jump to switch to 64-bit code segment */
-#if defined(__RAMSTAGE__)
- ljmp $RAM_CODE_SEG64, $__longmode_start
-#else
ljmp $ROM_CODE_SEG64, $__longmode_start
-
-#endif
.code64
__longmode_start:
diff --git a/src/cpu/x86/Makefile.inc b/src/cpu/x86/Makefile.inc
index 0502c723ca..2f789f7581 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -24,7 +24,6 @@ ifeq ($(CONFIG_PARALLEL_MP),y)
$(TARGET_STAGE)-srcs += $(SIPI_BIN).manual
endif
rmodules_$(ARCH-$(TARGET_STAGE)-y)-$(CONFIG_PARALLEL_MP) += sipi_vector.S
-rmodules_$(ARCH-$(TARGET_STAGE)-y)-generic-ccopts += $($(TARGET_STAGE)-generic-ccopts)
$(SIPI_DOTO): $(call src-to-obj,rmodules_$(ARCH-$(TARGET_STAGE)-y),src/cpu/x86/sipi_vector.S)
$(LD_rmodules_$(ARCH-$(TARGET_STAGE)-y)) -nostdlib -r -o $@ $^
diff --git a/src/cpu/x86/sipi_vector.S b/src/cpu/x86/sipi_vector.S
index bda49cc029..ba1ecb7de6 100644
--- a/src/cpu/x86/sipi_vector.S
+++ b/src/cpu/x86/sipi_vector.S
@@ -192,24 +192,11 @@ load_msr:
mov %eax, %cr4
#endif
-#ifdef __x86_64__
- /* entry64.inc preserves ebx. */
-#include <cpu/x86/64bit/entry64.inc>
-
- mov %rsi, %rdi /* cpu_num */
-
- movl c_handler, %eax
- call *%rax
-#else
/* c_handler(cpu_num), preserve proper stack alignment */
sub $12, %esp
push %esi /* cpu_num */
-
mov c_handler, %eax
call *%eax
-#endif
-
-
halt_jump:
hlt
jmp halt_jump