GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64 

Change-Id: Ieac4a4924ff4684b2a419471cd54e3d3b1f5bbe6
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48171
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Patrick Rudolph 2020-11-30 13:53:52 +01:00 committed by Patrick Rudolph
parent 2b77112e66
commit ed5835a04d
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/soc/intel/common/block/cpu/car/exit_car.S
View File

@ -28,7 +28,11 @@ chipset_teardown_car:
* Retrieve return address from stack as it will get trashed below if * Retrieve return address from stack as it will get trashed below if
* execution is utilizing the cache-as-ram stack. * execution is utilizing the cache-as-ram stack.
*/ */
#if ENV_X86_64
pop %rbx
#else
pop %ebx pop %ebx
#endif
/* Disable MTRRs. */ /* Disable MTRRs. */
mov $(MTRR_DEF_TYPE_MSR), %ecx mov $(MTRR_DEF_TYPE_MSR), %ecx
@ -95,4 +99,8 @@ car_nem_enhanced_teardown:
#endif #endif
/* Return to caller. */ /* Return to caller. */
#if ENV_X86_64
jmp *%rbx
#else
jmp *%ebx jmp *%ebx
#endif