summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-04 20:17:28 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-07 05:48:21 +0000
commitdc6c322fdac9e0a8a4d1a301ad5fb144ba50a986 (patch)
treed790032cf9032c6d2663d58737c3eba97e603da1
parentb2a5f0b9c2eb79f1a9d4fe4f87f1460c1be7fa6d (diff)
downloadcoreboot-dc6c322fdac9e0a8a4d1a301ad5fb144ba50a986.tar.xz
intel/apollolake: Replace smm_region_info() with smm_region()
Implementation remains the same. Change-Id: I8483bb8e5bba66b4854597f58ddcfe59aac17ae0 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34702 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Arthur Heymans <arthur@aheymans.xyz>
-rw-r--r--src/soc/intel/apollolake/cpu.c2
-rw-r--r--src/soc/intel/apollolake/memmap.c8
-rw-r--r--src/soc/intel/apollolake/romstage.c2
-rw-r--r--src/soc/intel/common/block/smm/smm.c6
4 files changed, 9 insertions, 9 deletions
diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index f3aa40c1a3..f402dfe175 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -214,7 +214,7 @@ static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
const uint32_t rmask = ~((1 << 12) - 1);
/* Initialize global tracking state. */
- smm_region_info(&smm_base, &smm_size);
+ smm_region(&smm_base, &smm_size);
smm_subregion(SMM_SUBREGION_HANDLER, &handler_base, &handler_size);
relo_attrs.smbase = (uint32_t)smm_base;
diff --git a/src/soc/intel/apollolake/memmap.c b/src/soc/intel/apollolake/memmap.c
index a4101b7446..3daac3cdf1 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -43,6 +43,12 @@ void *cbmem_top(void)
return tolum;
}
+void smm_region(void **start, size_t *size)
+{
+ *start = (void *)sa_get_tseg_base();
+ *size = sa_get_tseg_size();
+}
+
int smm_subregion(int sub, void **start, size_t *size)
{
uintptr_t sub_base;
@@ -50,7 +56,7 @@ int smm_subregion(int sub, void **start, size_t *size)
void *smm_base;
const size_t cache_size = CONFIG_SMM_RESERVED_SIZE;
- smm_region_info(&smm_base, &sub_size);
+ smm_region(&smm_base, &sub_size);
sub_base = (uintptr_t)smm_base;
assert(sub_size > CONFIG_SMM_RESERVED_SIZE);
diff --git a/src/soc/intel/apollolake/romstage.c b/src/soc/intel/apollolake/romstage.c
index 97e2f83bdd..62eb1db1fe 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -257,7 +257,7 @@ asmlinkage void car_stage_entry(void)
* when relocating the SMM handler as well as using the TSEG
* region for other purposes.
*/
- smm_region_info(&smm_base, &smm_size);
+ smm_region(&smm_base, &smm_size);
tseg_base = (uintptr_t)smm_base;
postcar_frame_add_mtrr(&pcf, tseg_base, smm_size, MTRR_TYPE_WRBACK);
diff --git a/src/soc/intel/common/block/smm/smm.c b/src/soc/intel/common/block/smm/smm.c
index 8ccd13a46e..489462dfa7 100644
--- a/src/soc/intel/common/block/smm/smm.c
+++ b/src/soc/intel/common/block/smm/smm.c
@@ -104,9 +104,3 @@ void smm_setup_structures(void *gnvs, void *tcg, void *smi1)
"d" (APM_CNT)
);
}
-
-void smm_region_info(void **start, size_t *size)
-{
- *start = (void *)sa_get_tseg_base();
- *size = sa_get_tseg_size();
-}