From 1eae39f4cd9a8cbb574ad5f7fafc251930f18a3a Mon Sep 17 00:00:00 2001 From: Raul E Rangel Date: Fri, 8 Oct 2021 13:10:38 -0600 Subject: arch/x86,cpu/x86: Fix 64-bit CPU_INFO_V2 build errors There are two possible code sections where the cpu_info macros can be included: .code32 and .code64 Doing a `push %eax` while in a .code64 section will result in a compiler error. This macro manually pushes the 32-bit register onto the stack so we can share the code between 32 and 64 bit builds. We also can't implicitly dereference per_cpu_segment_selector because it's a 32-bit address. Trying to do this results in the following: E: Invalid reloc type: 11 E: Illegal use of 32bit sign extended addressing at offset 0x1b2 If we load the address first, then dereference it, we can work around the limitation. With these fixes, 64-bit builds can now use CPU_INFO_V2. BUG=b:179699789 TEST=Boot qemu 64 bit build with CPU_INFO_V2 and 4 CPUs. See AP init work as expected. Signed-off-by: Raul E Rangel Change-Id: I4e72a808c9583bb2d0f697cbbd9cb9c0aa0ea2dc Reviewed-on: https://review.coreboot.org/c/coreboot/+/58232 Tested-by: build bot (Jenkins) Reviewed-by: Arthur Heymans --- src/arch/x86/c_start.S | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) (limited to 'src/arch/x86/c_start.S') diff --git a/src/arch/x86/c_start.S b/src/arch/x86/c_start.S index 9e718fcab0..c3fdfd9f17 100644 --- a/src/arch/x86/c_start.S +++ b/src/arch/x86/c_start.S @@ -90,7 +90,8 @@ _start: */ set_segment_descriptor_base $per_cpu_segment_descriptors, %esp - mov per_cpu_segment_selector, %eax + mov $per_cpu_segment_selector, %eax + movl (%eax), %eax mov %eax, %gs #endif -- cgit v1.2.3