From c7f0bca9c23ac8d96ffc5ec0fcaddf9190d7dbff Mon Sep 17 00:00:00 2001
From: Patrick Rudolph <patrick.rudolph@9elements.com>
Date: Tue, 30 Nov 2021 18:31:26 +0100
Subject: [PATCH] security/intel: Use defines for segment registers

Change-Id: I6f11039bafa3800d59d61defa8824ae962224c9b
Signed-off-by: Patrick Rudolph <patrick.rudolph@9elements.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/59763
Reviewed-by: Paul Menzel <paulepanter@mailbox.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
---
 src/security/intel/txt/getsec_enteraccs.S | 5 +++--
 1 file changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/security/intel/txt/getsec_enteraccs.S b/src/security/intel/txt/getsec_enteraccs.S
index be3a1b4f0b..09f9f389e6 100644
--- a/src/security/intel/txt/getsec_enteraccs.S
+++ b/src/security/intel/txt/getsec_enteraccs.S
@@ -3,6 +3,7 @@
 #include <cpu/x86/mtrr.h>
 #include <cpu/x86/cr.h>
 #include <cpu/x86/msr.h>
+#include <arch/ram_segs.h>
 
 #include "getsec_mtrr_setup.inc"
 
@@ -252,10 +253,10 @@ cond_clear_var_mtrrs:
 	lgdt	-48(%ebp)
 
 	/* Set cs */
-	ljmp	$0x10, $1f
+	ljmp	$RAM_CODE_SEG, $1f
 1:
 	/* Fix segment registers */
-	movl	$0x18, %eax
+	movl	$RAM_DATA_SEG, %eax
 	movl	%eax, %ds
 	movl	%eax, %es
 	movl	%eax, %ss