[coreboot-gerrit] Change in coreboot[master]: Revert "cpu/x86/sipi: Add x86_64 support"

[Patrick Rudolph (Code Review)]

Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/44734 )

Change subject: Revert "cpu/x86/sipi: Add x86_64 support"
......................................................................

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 
---
M src/cpu/x86/64bit/entry64.inc
M src/cpu/x86/Makefile.inc
M src/cpu/x86/sipi_vector.S
3 files changed, 0 insertions(+), 24 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/34/44734/1

diff --git a/src/cpu/x86/64bit/entry64.inc b/src/cpu/x86/64bit/entry64.inc
index 7025517..65c0fdc 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 @@
    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 0502c72..2f789f7 100644
--- a/src/cpu/x86/Makefile.inc
+++ b/src/cpu/x86/Makefile.inc
@@ -24,7 +24,6 @@
 $(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 bda49cc..ba1ecb7 100644
--- a/src/cpu/x86/sipi_vector.S
+++ b/src/cpu/x86/sipi_vector.S
@@ -192,24 +192,11 @@
    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