commit 9ddd9002cc03c7b50689b80ef6b7a97e9d48fbeb
author Arthur Heymans <arthur@aheymans.xyz> Thu Dec 03 11:02:42 2020 +0100
committer Arthur Heymans <arthur@aheymans.xyz> Fri Dec 04 17:20:30 2020 +0000
tree 35e3319ab4661d3fe170052d9f381a518ec90e00
parent 161d809bc65bd95594ba1e712bfed31d66a2d546

cpu/x86/smm_module_loaderv2: Fix compiling for x86_64

Change-Id: I9288ede88f822ff78dd9cb91020451dc935203a0
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/48263
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-by: Christian Walter <christian.walter@9elements.com>

src/cpu/x86/smm/smm_module_loaderv2.c

diff --git a/src/cpu/x86/smm/smm_module_loaderv2.c b/src/cpu/x86/smm/smm_module_loaderv2.c
index 14ed9b8..e3e9c28 100644
--- a/src/cpu/x86/smm/smm_module_loaderv2.c
+++ b/src/cpu/x86/smm/smm_module_loaderv2.c
@@ -221,7 +221,7 @@
  */
 
 static int smm_place_entry_code(uintptr_t smbase, unsigned int num_cpus,
-				unsigned int stack_top, const struct smm_loader_params *params)
+				uintptr_t stack_top, const struct smm_loader_params *params)
 {
 	unsigned int i;
 	unsigned int size;
@@ -235,7 +235,7 @@
 			if (cpus[num_cpus - 1].smbase +
 				params->smm_main_entry_offset < stack_top) {
 				printk(BIOS_ERR, "%s: stack encroachment\n", __func__);
-				printk(BIOS_ERR, "%s: smbase %zx, stack_top %x\n",
+				printk(BIOS_ERR, "%s: smbase %zx, stack_top %lx\n",
 					__func__, cpus[num_cpus].smbase, stack_top);
 				return 0;
 			}
@@ -245,7 +245,7 @@
 		return 0;
 	}
 
-	printk(BIOS_INFO, "%s: smbase %zx, stack_top %x\n",
+	printk(BIOS_INFO, "%s: smbase %zx, stack_top %lx\n",
 		__func__, cpus[num_cpus-1].smbase, stack_top);
 
 	/* start at 1, the first CPU stub code is already there */
@@ -311,9 +311,9 @@
 	 * sets up the stack, and then jumps to common SMI handler
 	 */
 	if (params->num_concurrent_save_states > 1 || stub_entry_offset != 0) {
-		rc = smm_place_entry_code((unsigned int)base,
-			params->num_concurrent_save_states,
-			(unsigned int)params->stack_top, params);
+		rc = smm_place_entry_code((uintptr_t)base,
+					  params->num_concurrent_save_states,
+					  (uintptr_t)params->stack_top, params);
 	}
 	return rc;
 }
@@ -384,7 +384,7 @@
 	/* The save state size encroached over the first SMM entry point. */
 	if (size <= params->smm_main_entry_offset) {
 		printk(BIOS_ERR, "%s: encroachment over SMM entry point\n", __func__);
-		printk(BIOS_ERR, "%s: state save size: %zx : smm_entry_offset -> %x\n",
+		printk(BIOS_ERR, "%s: state save size: %zx : smm_entry_offset -> %lx\n",
 			__func__, size, params->smm_main_entry_offset);
 		return -1;
 	}