Kyösti Mälkki has uploaded this change for review.
soc/amd: Rename smm_region_info() to smm_region()
Change-Id: I361fb0e02fd0bd92bb1e13fe84c898a1ac85aa40
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
---
M src/include/cpu/x86/smm.h
M src/soc/amd/picasso/cpu.c
M src/soc/amd/picasso/ramtop.c
M src/soc/amd/picasso/romstage.c
M src/soc/amd/stoneyridge/cpu.c
M src/soc/amd/stoneyridge/ramtop.c
M src/soc/amd/stoneyridge/romstage.c
7 files changed, 6 insertions(+), 7 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/03/34703/1
diff --git a/src/include/cpu/x86/smm.h b/src/include/cpu/x86/smm.h
index edd1be8..9e631b8 100644
--- a/src/include/cpu/x86/smm.h
+++ b/src/include/cpu/x86/smm.h
@@ -588,7 +588,6 @@
* 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 84f4729..c1d2aff 100644
--- a/src/soc/amd/picasso/cpu.c
+++ b/src/soc/amd/picasso/cpu.c
@@ -69,7 +69,7 @@
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 8eb2e39..4ff4252 100644
--- a/src/soc/amd/picasso/ramtop.c
+++ b/src/soc/amd/picasso/ramtop.c
@@ -91,7 +91,7 @@
}
}
-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 458886d..64c18d2 100644
--- a/src/soc/amd/picasso/romstage.c
+++ b/src/soc/amd/picasso/romstage.c
@@ -91,7 +91,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/amd/stoneyridge/cpu.c b/src/soc/amd/stoneyridge/cpu.c
index 9961153..26d9f7f 100644
--- a/src/soc/amd/stoneyridge/cpu.c
+++ b/src/soc/amd/stoneyridge/cpu.c
@@ -69,7 +69,7 @@
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 8eb2e39..4ff4252 100644
--- a/src/soc/amd/stoneyridge/ramtop.c
+++ b/src/soc/amd/stoneyridge/ramtop.c
@@ -91,7 +91,7 @@
}
}
-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 4f38dbf..3c97e5e 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -176,7 +176,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);
To view, visit change 34703. To unsubscribe, or for help writing mail filters, visit settings.