summaryrefslogtreecommitdiff
path: root/src/drivers
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-05 15:10:18 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-08 04:53:18 +0000
commit14222d86785d89415c014dab294205fd186b7084 (patch)
tree8760046ac6e86fc86b3d570a2e7281dc6e42fafd /src/drivers
parent9970b61ad3049d87650cd7b4eb5f47d667098186 (diff)
downloadcoreboot-14222d86785d89415c014dab294205fd186b7084.tar.xz
arch/x86: Change smm_subregion() prototype
Do this to avoid some amount of explicit typecasting that would be required otherwise. Change-Id: I5bc2c3c1dd579f7c6c3d3354c0691e4ba3c778e1 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34706 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
Diffstat (limited to 'src/drivers')
-rw-r--r--src/drivers/intel/fsp1_1/raminit.c8
-rw-r--r--src/drivers/intel/fsp1_1/ramstage.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/drivers/intel/fsp1_1/raminit.c b/src/drivers/intel/fsp1_1/raminit.c
index 2f53957596..7b893d269e 100644
--- a/src/drivers/intel/fsp1_1/raminit.c
+++ b/src/drivers/intel/fsp1_1/raminit.c
@@ -53,7 +53,7 @@ void raminit(struct romstage_params *params)
UPD_DATA_REGION *upd_ptr;
int fsp_verification_failure = 0;
EFI_PEI_HOB_POINTERS hob_ptr;
- char *smm_base;
+ uintptr_t smm_base;
size_t smm_size;
/*
@@ -148,9 +148,9 @@ void raminit(struct romstage_params *params)
/* Display SMM area */
if (CONFIG(HAVE_SMI_HANDLER)) {
- smm_region((void **)&smm_base, &smm_size);
+ smm_region(&smm_base, &smm_size);
printk(BIOS_DEBUG, "0x%08x: smm_size\n", (unsigned int)smm_size);
- printk(BIOS_DEBUG, "0x%p: smm_base\n", smm_base);
+ printk(BIOS_DEBUG, "0x%08x: smm_base\n", (unsigned int)smm_base);
}
/* Migrate CAR data */
@@ -238,7 +238,7 @@ void raminit(struct romstage_params *params)
printk(BIOS_ERR, "ERROR - Reserving FSP memory area!\n");
if (CONFIG(HAVE_SMI_HANDLER) && cbmem_root != NULL) {
- size_t delta_bytes = (unsigned int)smm_base
+ size_t delta_bytes = smm_base
- cbmem_root->PhysicalStart
- cbmem_root->ResourceLength;
printk(BIOS_ERR,
diff --git a/src/drivers/intel/fsp1_1/ramstage.c b/src/drivers/intel/fsp1_1/ramstage.c
index 049dfd05f0..4b567da188 100644
--- a/src/drivers/intel/fsp1_1/ramstage.c
+++ b/src/drivers/intel/fsp1_1/ramstage.c
@@ -33,19 +33,19 @@ __weak void soc_after_silicon_init(void)
/* Display SMM memory map */
static void smm_memory_map(void)
{
- void *base;
+ uintptr_t base;
size_t size;
int i;
printk(BIOS_SPEW, "SMM Memory Map\n");
smm_region(&base, &size);
- printk(BIOS_SPEW, "SMRAM : %p 0x%zx\n", base, size);
+ printk(BIOS_SPEW, "SMRAM : 0x%zx 0x%zx\n", base, size);
for (i = 0; i < SMM_SUBREGION_NUM; i++) {
if (smm_subregion(i, &base, &size))
continue;
- printk(BIOS_SPEW, " Subregion %d: %p 0x%zx\n", i, base, size);
+ printk(BIOS_SPEW, " Subregion %d: 0x%zx 0x%zx\n", i, base, size);
}
}