Change in coreboot[master]: soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64
Patrick Rudolph has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/48171 )
Change subject: soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64 ......................................................................
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 --- M src/soc/intel/common/block/cpu/car/exit_car.S 1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/48171/1
diff --git a/src/soc/intel/common/block/cpu/car/exit_car.S b/src/soc/intel/common/block/cpu/car/exit_car.S index 9480a5a..191232a 100644 --- a/src/soc/intel/common/block/cpu/car/exit_car.S +++ b/src/soc/intel/common/block/cpu/car/exit_car.S @@ -28,7 +28,11 @@ * Retrieve return address from stack as it will get trashed below if * execution is utilizing the cache-as-ram stack. */ +#if ENV_X86_64 + pop %rbx +#else pop %ebx +#endif
/* Disable MTRRs. */ mov $(MTRR_DEF_TYPE_MSR), %ecx @@ -95,4 +99,8 @@ #endif
/* Return to caller. */ +#if ENV_X86_64 + jmp *%rbx +#else jmp *%ebx +#endif
Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48171 )
Change subject: soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64 ......................................................................
Patch Set 1: Code-Review+2
Hello build bot (Jenkins), Arthur Heymans, Patrick Rudolph,
I'd like you to reexamine a change. Please visit
https://review.coreboot.org/c/coreboot/+/48171
to look at the new patch set (#2).
Change subject: soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64 ......................................................................
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 --- M src/soc/intel/common/block/cpu/car/exit_car.S 1 file changed, 8 insertions(+), 0 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/71/48171/2
Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/48171 )
Change subject: soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64 ......................................................................
Patch Set 2: Code-Review+2
Patrick Rudolph has submitted this change. ( https://review.coreboot.org/c/coreboot/+/48171 )
Change subject: soc/intel/common/block/cpu/car/exit_car: Fix compilation on x86_64 ......................................................................
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 --- M src/soc/intel/common/block/cpu/car/exit_car.S 1 file changed, 8 insertions(+), 0 deletions(-)
Approvals: build bot (Jenkins): Verified Arthur Heymans: Looks good to me, approved Angel Pons: Looks good to me, approved
diff --git a/src/soc/intel/common/block/cpu/car/exit_car.S b/src/soc/intel/common/block/cpu/car/exit_car.S index 9480a5a..191232a 100644 --- a/src/soc/intel/common/block/cpu/car/exit_car.S +++ b/src/soc/intel/common/block/cpu/car/exit_car.S @@ -28,7 +28,11 @@ * Retrieve return address from stack as it will get trashed below if * execution is utilizing the cache-as-ram stack. */ +#if ENV_X86_64 + pop %rbx +#else pop %ebx +#endif
/* Disable MTRRs. */ mov $(MTRR_DEF_TYPE_MSR), %ecx @@ -95,4 +99,8 @@ #endif
/* Return to caller. */ +#if ENV_X86_64 + jmp *%rbx +#else jmp *%ebx +#endif
-
Angel Pons (Code Review) -
Arthur Heymans (Code Review)
-
Patrick Rudolph (Code Review)