[coreboot-gerrit] Change in coreboot[master]: intel/apollolake: Replace smm_region_info() with smm_region()

[Kyösti Mälkki (Code Review)]

Kyösti Mälkki has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/34702 )

Change subject: intel/apollolake: Replace smm_region_info() with smm_region()
......................................................................

intel/apollolake: Replace smm_region_info() with smm_region()

Implementation remains the same.

Change-Id: I8483bb8e5bba66b4854597f58ddcfe59aac17ae0
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/34702
Tested-by: build bot (Jenkins) 
Reviewed-by: Arthur Heymans 
---
M src/soc/intel/apollolake/cpu.c
M src/soc/intel/apollolake/memmap.c
M src/soc/intel/apollolake/romstage.c
M src/soc/intel/common/block/smm/smm.c
4 files changed, 9 insertions(+), 9 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Arthur Heymans: Looks good to me, approved

diff --git a/src/soc/intel/apollolake/cpu.c b/src/soc/intel/apollolake/cpu.c
index f3aa40c..f402dfe 100644
--- a/src/soc/intel/apollolake/cpu.c
+++ b/src/soc/intel/apollolake/cpu.c
@@ -214,7 +214,7 @@
    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 a4101b7..3daac3c 100644
--- a/src/soc/intel/apollolake/memmap.c
+++ b/src/soc/intel/apollolake/memmap.c
@@ -43,6 +43,12 @@
    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 @@
    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 97e2f83..62eb1db 100644
--- a/src/soc/intel/apollolake/romstage.c
+++ b/src/soc/intel/apollolake/romstage.c
@@ -257,7 +257,7 @@
    * 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 8ccd13a..489462d 100644
--- a/src/soc/intel/common/block/smm/smm.c
+++ b/src/soc/intel/common/block/smm/smm.c
@@ -104,9 +104,3 @@
    	  "d" (APM_CNT)
    );
 }
-
-void smm_region_info(void **start, size_t *size)
-{
-	*start = (void *)sa_get_tseg_base();
-	*size = sa_get_tseg_size();
-}