summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-04 20:26:53 +0300
committerKyösti Mälkki <kyosti.malkki@gmail.com>2019-08-07 05:49:33 +0000
commit7db852aa5770b287719805fc0ee727169ee6b424 (patch)
tree66ce3451328b84fd3e532360d1e0c444dc2c76bf
parentdc6c322fdac9e0a8a4d1a301ad5fb144ba50a986 (diff)
downloadcoreboot-7db852aa5770b287719805fc0ee727169ee6b424.tar.xz
soc/amd: Rename smm_region_info() to smm_region()
Change-Id: I361fb0e02fd0bd92bb1e13fe84c898a1ac85aa40 Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com> Reviewed-on: https://review.coreboot.org/c/coreboot/+/34703 Reviewed-by: Arthur Heymans <arthur@aheymans.xyz> Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
-rw-r--r--src/include/cpu/x86/smm.h1
-rw-r--r--src/soc/amd/picasso/cpu.c2
-rw-r--r--src/soc/amd/picasso/ramtop.c2
-rw-r--r--src/soc/amd/picasso/romstage.c2
-rw-r--r--src/soc/amd/stoneyridge/cpu.c2
-rw-r--r--src/soc/amd/stoneyridge/ramtop.c2
-rw-r--r--src/soc/amd/stoneyridge/romstage.c2
7 files changed, 6 insertions, 7 deletions
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index edd1be8588..9e631b855f 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -588,7 +588,6 @@ void restore_default_smm_area(void *smm_save_area);
* protections. e.g. TSEG.
*/
void smm_region(void **start, size_t *size);
-void smm_region_info(void **start, size_t *size);
enum {
/* SMM handler area. */
diff --git a/src/soc/amd/picasso/cpu.c b/src/soc/amd/picasso/cpu.c
index 84f4729b20..c1d2aff129 100644
--- a/src/soc/amd/picasso/cpu.c
+++ b/src/soc/amd/picasso/cpu.c
@@ -69,7 +69,7 @@ static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
size_t handler_size;
/* 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/amd/picasso/ramtop.c b/src/soc/amd/picasso/ramtop.c
index 8eb2e39883..4ff4252c76 100644
--- a/src/soc/amd/picasso/ramtop.c
+++ b/src/soc/amd/picasso/ramtop.c
@@ -91,7 +91,7 @@ void stage_cache_external_region(void **base, size_t *size)
}
}
-void smm_region_info(void **start, size_t *size)
+void smm_region(void **start, size_t *size)
{
*start = (void *)smm_region_start();
*size = smm_region_size();
diff --git a/src/soc/amd/picasso/romstage.c b/src/soc/amd/picasso/romstage.c
index 458886d70c..64c18d28ee 100644
--- a/src/soc/amd/picasso/romstage.c
+++ b/src/soc/amd/picasso/romstage.c
@@ -91,7 +91,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/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c
index 9961153b0b..26d9f7fac0 100644
--- a/src/soc/amd/stoneyridge/cpu.c
+++ b/src/soc/amd/stoneyridge/cpu.c
@@ -69,7 +69,7 @@ static void get_smm_info(uintptr_t *perm_smbase, size_t *perm_smsize,
size_t handler_size;
/* 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/amd/stoneyridge/ramtop.c b/src/soc/amd/stoneyridge/ramtop.c
index 8eb2e39883..4ff4252c76 100644
--- a/src/soc/amd/stoneyridge/ramtop.c
+++ b/src/soc/amd/stoneyridge/ramtop.c
@@ -91,7 +91,7 @@ void stage_cache_external_region(void **base, size_t *size)
}
}
-void smm_region_info(void **start, size_t *size)
+void smm_region(void **start, size_t *size)
{
*start = (void *)smm_region_start();
*size = smm_region_size();
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c
index 4f38dbf138..3c97e5efb6 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -176,7 +176,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);