Change in ...coreboot[master]: soc/amd/common: Introduce agesa_execute_state()

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

Kyösti Mälkki has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/31483

Change subject: soc/amd/common: Introduce agesa_execute_state()
......................................................................

soc/amd/common: Introduce agesa_execute_state()

Each entrypoint to AGESA goes through the same sequence
and have same the function signature.

To avoid introducing bunch of preprocessor magic, rename
all the agesawrapper_amdXXX() functions that are actual
entrypoints to AGESA API, make them static, and provide
a single exposed entry function agesa_execute_state().

Change-Id: I96ae1874132da3843aa42c2f4e8a59ec771d3893
Signed-off-by: Kyösti Mälkki 
---
M src/soc/amd/common/block/include/amdblocks/agesawrapper.h
M src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
M src/soc/amd/common/block/pi/agesawrapper.c
M src/soc/amd/common/block/pi/amd_late_init.c
M src/soc/amd/common/block/pi/amd_resume_final.c
M src/soc/amd/stoneyridge/chip.c
M src/soc/amd/stoneyridge/northbridge.c
M src/soc/amd/stoneyridge/romstage.c
8 files changed, 76 insertions(+), 36 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/31483/1

diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h
index 2f3b8a6..04db424 100644
--- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h
+++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h
@@ -34,22 +34,11 @@
 /* Return current dispatcher or NULL on error. */
 MODULE_ENTRY agesa_get_dispatcher(void);

+AGESA_STATUS agesa_execute_state(AGESA_STRUCT_NAME func);
 AGESA_STATUS amd_late_run_ap_task(AP_EXE_PARAMS *ApExeParams);

-AGESA_STATUS agesawrapper_amdinitreset(void);
-AGESA_STATUS agesawrapper_amdinitearly(void);
-AGESA_STATUS agesawrapper_amdinitenv(void);
-AGESA_STATUS agesawrapper_amdinitlate(void);
-AGESA_STATUS agesawrapper_amdinitpost(void);
-AGESA_STATUS agesawrapper_amdinitmid(void);
 void *agesawrapper_getlateinitptr(int pick);
-AGESA_STATUS agesawrapper_amdinitrtb(void);
-AGESA_STATUS agesawrapper_amdinitresume(void);
-AGESA_STATUS agesawrapper_amds3laterestore(void);
-AGESA_STATUS agesawrapper_amds3finalrestore(void);

-AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
-AGESA_STATUS agesawrapper_fchs3laterestore(void);

void OemCustomizeInitEarly(AMD_EARLY_PARAMS *InitEarly);
 void amd_initcpuio(void);
diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
index 1188f05..86e32af 100644
--- a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
+++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
@@ -42,11 +42,11 @@
    return statusStrings[sret];
 }

-static inline u32 do_agesawrapper(AGESA_STATUS (*func)(void), const char *name)
+static inline u32 do_agesawrapper(AGESA_STRUCT_NAME func, const char *name)
 {
    AGESA_STATUS ret;
    printk(BIOS_DEBUG, "agesawrapper_%s() entry\n", name);
-	ret = func();
+	ret = agesa_execute_state(func);
    printk(BIOS_DEBUG, "agesawrapper_%s() returned %s\n",
    		name, decodeAGESA_STATUS(ret));
    return (u32)ret;
diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c
index fc69b46..1726955 100644
--- a/src/soc/amd/common/block/pi/agesawrapper.c
+++ b/src/soc/amd/common/block/pi/agesawrapper.c
@@ -2,7 +2,7 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2012 - 2017 Advanced Micro Devices, Inc.
- * Copyright (C) 2018 Kyösti Mälkki
+ * Copyright (C) 2018 - 2019 Kyösti Mälkki
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -89,7 +89,7 @@
    return interface_struct->NewStructPtr;
 }

-AGESA_STATUS agesawrapper_amdinitreset(void)
+static AGESA_STATUS amd_init_reset(void)
 {
    AGESA_STATUS status;
    AMD_RESET_PARAMS _ResetParams;
@@ -114,7 +114,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amdinitearly(void)
+static AGESA_STATUS amd_init_early(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -171,7 +171,7 @@
    				uma_size / MiB, uma_start);
 }

-AGESA_STATUS agesawrapper_amdinitpost(void)
+static AGESA_STATUS amd_init_post(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -226,7 +226,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amdinitenv(void)
+static AGESA_STATUS amd_init_env(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -276,7 +276,7 @@
    }
 }

-AGESA_STATUS agesawrapper_amdinitmid(void)
+static AGESA_STATUS amd_init_mid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -303,7 +303,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amdinitlate(void)
+static AGESA_STATUS amd_init_late(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -358,7 +358,7 @@
    return AmdLateRunApTask(ApExeParams);
 }

-AGESA_STATUS agesawrapper_amdinitrtb(void)
+static AGESA_STATUS amd_init_rtb(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -388,7 +388,7 @@
    return Status;
 }

-AGESA_STATUS agesawrapper_amdinitresume(void)
+static AGESA_STATUS amd_init_resume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -413,7 +413,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amds3laterestore(void)
+static AGESA_STATUS amd_s3late_restore(void)
 {
    AGESA_STATUS Status;
    AMD_S3LATE_PARAMS _S3LateParams;
@@ -445,7 +445,7 @@
    return Status;
 }

-AGESA_STATUS agesawrapper_amds3finalrestore(void)
+static AGESA_STATUS amd_s3final_restore(void)
 {
    AGESA_STATUS Status;
    AMD_S3FINAL_PARAMS _S3FinalParams;
@@ -474,3 +474,55 @@

return Status;
 }
+
+static AGESA_STATUS romstage_dispatch(AMD_CONFIG_PARAMS *StdHeader)
+{
+	switch (StdHeader->Func) {
+	case AMD_INIT_RESET:
+		return amd_init_reset();
+	case AMD_INIT_EARLY:
+		return amd_init_early();
+	case AMD_INIT_POST:
+		return amd_init_post();
+	case AMD_INIT_RESUME:
+		return amd_init_resume();
+	default:
+		return AGESA_UNSUPPORTED;
+	}
+}
+
+static AGESA_STATUS ramstage_dispatch(AMD_CONFIG_PARAMS *StdHeader)
+{
+	switch (StdHeader->Func) {
+	case AMD_INIT_ENV:
+		return amd_init_env();
+	case AMD_INIT_MID:
+		return amd_init_mid();
+	case AMD_INIT_LATE:
+		return amd_init_late();
+	case AMD_INIT_RTB:
+		return amd_init_rtb();
+	case AMD_S3LATE_RESTORE:
+		return amd_s3late_restore();
+	case AMD_S3FINAL_RESTORE:
+		return amd_s3final_restore();
+	default:
+		return AGESA_UNSUPPORTED;
+	}
+}
+
+AGESA_STATUS agesa_execute_state(AGESA_STRUCT_NAME func)
+{
+	AGESA_STATUS status = AGESA_UNSUPPORTED;
+	AMD_CONFIG_PARAMS template = {};
+	AMD_CONFIG_PARAMS *StdHeader = &template;
+
+	StdHeader->Func = func;
+
+	if (ENV_ROMSTAGE)
+		status = romstage_dispatch(StdHeader);
+	if (ENV_RAMSTAGE)
+		status = ramstage_dispatch(StdHeader);
+
+	return status;
+}
diff --git a/src/soc/amd/common/block/pi/amd_late_init.c b/src/soc/amd/common/block/pi/amd_late_init.c
index 68cf3a1..81d42b7 100644
--- a/src/soc/amd/common/block/pi/amd_late_init.c
+++ b/src/soc/amd/common/block/pi/amd_late_init.c
@@ -178,12 +178,12 @@
    if (acpi_is_wakeup_s3())
    	return;

-	do_agesawrapper(agesawrapper_amdinitlate, "amdinitlate");
+	do_agesawrapper(AMD_INIT_LATE, "amdinitlate");

if (!acpi_s3_resume_allowed())
    	return;

-	do_agesawrapper(agesawrapper_amdinitrtb, "amdinitrtb");
+	do_agesawrapper(AMD_INIT_RTB, "amdinitrtb");
 }

BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT, agesawrapper_post_device,
diff --git a/src/soc/amd/common/block/pi/amd_resume_final.c b/src/soc/amd/common/block/pi/amd_resume_final.c
index a282665..363ba83 100644
--- a/src/soc/amd/common/block/pi/amd_resume_final.c
+++ b/src/soc/amd/common/block/pi/amd_resume_final.c
@@ -18,7 +18,7 @@

static void agesawrapper_s3finalrestore(void *unused)
 {
-	do_agesawrapper(agesawrapper_amds3finalrestore, "amds3finalrestore");
+	do_agesawrapper(AMD_S3FINAL_RESTORE, "amds3finalrestore");
 }

BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY,
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index a29c56c..0ecd3e9 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -163,12 +163,11 @@
    		psp_load_named_blob(MBOX_BIOS_CMD_SMU_FW2, "smu_fw2");

post_code(0x47);
-		do_agesawrapper(agesawrapper_amdinitenv, "amdinitenv");
+		do_agesawrapper(AMD_INIT_ENV, "amdinitenv");
    } else {
    	/* Complete the initial system restoration */
    	post_code(0x46);
-		do_agesawrapper(agesawrapper_amds3laterestore,
-						"amds3laterestore");
+		do_agesawrapper(AMD_S3LATE_RESTORE, "amds3laterestore");
    }
 }

diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 4a856a9..c10920f 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -391,7 +391,7 @@
 {
    /* Must be called after PCI enumeration and resource allocation */
    if (!romstage_handoff_is_resume())
-		do_agesawrapper(agesawrapper_amdinitmid, "amdinitmid");
+		do_agesawrapper(AMD_INIT_MID, "amdinitmid");
 }

void domain_set_resources(struct device *dev)
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c
index 9f8aed8..2769dfe 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -65,11 +65,11 @@
 static void agesa_call(void)
 {
    post_code(0x37);
-	do_agesawrapper(agesawrapper_amdinitreset, "amdinitreset");
+	do_agesawrapper(AMD_INIT_RESET, "amdinitreset");

post_code(0x38);
    /* APs will not exit amdinitearly */
-	do_agesawrapper(agesawrapper_amdinitearly, "amdinitearly");
+	do_agesawrapper(AMD_INIT_EARLY, "amdinitearly");
 }

static void bsp_agesa_call(void)
@@ -102,7 +102,7 @@

if (!s3_resume) {
    	post_code(0x40);
-		do_agesawrapper(agesawrapper_amdinitpost, "amdinitpost");
+		do_agesawrapper(AMD_INIT_POST, "amdinitpost");

post_code(0x41);
    	/*
@@ -137,7 +137,7 @@
    } else {
    	printk(BIOS_INFO, "S3 detected\n");
    	post_code(0x60);
-		do_agesawrapper(agesawrapper_amdinitresume, "amdinitresume");
+		do_agesawrapper(AMD_INIT_RESUME, "amdinitresume");

post_code(0x61);
    }

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

Hello build bot (Jenkins),

I'd like you to reexamine a change. Please visit

https://review.coreboot.org/c/coreboot/+/31483

to look at the new patch set (#2).

Change subject: soc/amd/common: Introduce agesa_execute_state()
......................................................................

soc/amd/common: Introduce agesa_execute_state()

Each entrypoint to AGESA goes through the same sequence
and have same the function signature.

To avoid introducing bunch of preprocessor magic, rename
all the agesawrapper_amdXXX() functions that are actual
entrypoints to AGESA API, make them static, and provide
a single exposed entry function agesa_execute_state().

Change-Id: I96ae1874132da3843aa42c2f4e8a59ec771d3893
Signed-off-by: Kyösti Mälkki 
---
M src/soc/amd/common/block/include/amdblocks/agesawrapper.h
M src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
M src/soc/amd/common/block/pi/agesawrapper.c
M src/soc/amd/common/block/pi/amd_late_init.c
M src/soc/amd/common/block/pi/amd_resume_final.c
M src/soc/amd/common/block/s3/Makefile.inc
M src/soc/amd/stoneyridge/chip.c
M src/soc/amd/stoneyridge/northbridge.c
M src/soc/amd/stoneyridge/romstage.c
9 files changed, 78 insertions(+), 38 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/83/31483/2

[Paul Menzel (Code Review)]

Paul Menzel has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31483 )

Change subject: soc/amd/common: Introduce agesa_execute_state()
......................................................................

Patch Set 3: Code-Review+1

(1 comment)

https://review.coreboot.org/#/c/31483/3//COMMIT_MSG 
Commit Message:

https://review.coreboot.org/#/c/31483/3//COMMIT_MSG@10 
PS3, Line 10: have
has

[Arthur Heymans (Code Review)]

Arthur Heymans has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31483 )

Change subject: soc/amd/common: Introduce agesa_execute_state()
......................................................................

Patch Set 4: Code-Review+2

[Patrick Georgi (Code Review)]

Patrick Georgi has submitted this change and it was merged. ( https://review.coreboot.org/c/coreboot/+/31483 )

Change subject: soc/amd/common: Introduce agesa_execute_state()
......................................................................

soc/amd/common: Introduce agesa_execute_state()

Each entrypoint to AGESA goes through the same sequence
and have same the function signature.

To avoid introducing bunch of preprocessor magic, rename
all the agesawrapper_amdXXX() functions that are actual
entrypoints to AGESA API, make them static, and provide
a single exposed entry function agesa_execute_state().

Change-Id: I96ae1874132da3843aa42c2f4e8a59ec771d3893
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31483
Reviewed-by: Arthur Heymans 
Reviewed-by: Paul Menzel 
Tested-by: build bot (Jenkins) 
---
M src/soc/amd/common/block/include/amdblocks/agesawrapper.h
M src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
M src/soc/amd/common/block/pi/agesawrapper.c
M src/soc/amd/common/block/pi/amd_late_init.c
M src/soc/amd/common/block/pi/amd_resume_final.c
M src/soc/amd/common/block/s3/Makefile.inc
M src/soc/amd/stoneyridge/chip.c
M src/soc/amd/stoneyridge/northbridge.c
M src/soc/amd/stoneyridge/romstage.c
9 files changed, 78 insertions(+), 38 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Paul Menzel: Looks good to me, but someone else must approve
  Arthur Heymans: Looks good to me, approved

diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h
index 2f3b8a6..04db424 100644
--- a/src/soc/amd/common/block/include/amdblocks/agesawrapper.h
+++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper.h
@@ -34,22 +34,11 @@
 /* Return current dispatcher or NULL on error. */
 MODULE_ENTRY agesa_get_dispatcher(void);

+AGESA_STATUS agesa_execute_state(AGESA_STRUCT_NAME func);
 AGESA_STATUS amd_late_run_ap_task(AP_EXE_PARAMS *ApExeParams);

-AGESA_STATUS agesawrapper_amdinitreset(void);
-AGESA_STATUS agesawrapper_amdinitearly(void);
-AGESA_STATUS agesawrapper_amdinitenv(void);
-AGESA_STATUS agesawrapper_amdinitlate(void);
-AGESA_STATUS agesawrapper_amdinitpost(void);
-AGESA_STATUS agesawrapper_amdinitmid(void);
 void *agesawrapper_getlateinitptr(int pick);
-AGESA_STATUS agesawrapper_amdinitrtb(void);
-AGESA_STATUS agesawrapper_amdinitresume(void);
-AGESA_STATUS agesawrapper_amds3laterestore(void);
-AGESA_STATUS agesawrapper_amds3finalrestore(void);

-AGESA_STATUS agesawrapper_fchs3earlyrestore(void);
-AGESA_STATUS agesawrapper_fchs3laterestore(void);

void OemCustomizeInitEarly(AMD_EARLY_PARAMS *InitEarly);
 void amd_initcpuio(void);
diff --git a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
index 1188f05..86e32af 100644
--- a/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
+++ b/src/soc/amd/common/block/include/amdblocks/agesawrapper_call.h
@@ -42,11 +42,11 @@
    return statusStrings[sret];
 }

-static inline u32 do_agesawrapper(AGESA_STATUS (*func)(void), const char *name)
+static inline u32 do_agesawrapper(AGESA_STRUCT_NAME func, const char *name)
 {
    AGESA_STATUS ret;
    printk(BIOS_DEBUG, "agesawrapper_%s() entry\n", name);
-	ret = func();
+	ret = agesa_execute_state(func);
    printk(BIOS_DEBUG, "agesawrapper_%s() returned %s\n",
    		name, decodeAGESA_STATUS(ret));
    return (u32)ret;
diff --git a/src/soc/amd/common/block/pi/agesawrapper.c b/src/soc/amd/common/block/pi/agesawrapper.c
index d65400e..6cdabd3 100644
--- a/src/soc/amd/common/block/pi/agesawrapper.c
+++ b/src/soc/amd/common/block/pi/agesawrapper.c
@@ -2,7 +2,7 @@
  * This file is part of the coreboot project.
  *
  * Copyright (C) 2012 - 2017 Advanced Micro Devices, Inc.
- * Copyright (C) 2018 Kyösti Mälkki
+ * Copyright (C) 2018 - 2019 Kyösti Mälkki
  *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -88,7 +88,7 @@
    return interface_struct->NewStructPtr;
 }

-AGESA_STATUS agesawrapper_amdinitreset(void)
+static AGESA_STATUS amd_init_reset(void)
 {
    AGESA_STATUS status;
    AMD_RESET_PARAMS _ResetParams;
@@ -113,7 +113,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amdinitearly(void)
+static AGESA_STATUS amd_init_early(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -170,7 +170,7 @@
    				uma_size / MiB, uma_start);
 }

-AGESA_STATUS agesawrapper_amdinitpost(void)
+static AGESA_STATUS amd_init_post(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -225,7 +225,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amdinitenv(void)
+static AGESA_STATUS amd_init_env(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -275,7 +275,7 @@
    }
 }

-AGESA_STATUS agesawrapper_amdinitmid(void)
+static AGESA_STATUS amd_init_mid(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -302,7 +302,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amdinitlate(void)
+static AGESA_STATUS amd_init_late(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -357,7 +357,7 @@
    return AmdLateRunApTask(ApExeParams);
 }

-AGESA_STATUS agesawrapper_amdinitrtb(void)
+static AGESA_STATUS amd_init_rtb(void)
 {
    AGESA_STATUS Status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -387,7 +387,7 @@
    return Status;
 }

-AGESA_STATUS agesawrapper_amdinitresume(void)
+static AGESA_STATUS amd_init_resume(void)
 {
    AGESA_STATUS status;
    AMD_INTERFACE_PARAMS AmdParamStruct = {
@@ -412,7 +412,7 @@
    return status;
 }

-AGESA_STATUS agesawrapper_amds3laterestore(void)
+static AGESA_STATUS amd_s3late_restore(void)
 {
    AGESA_STATUS Status;
    AMD_S3LATE_PARAMS _S3LateParams;
@@ -444,7 +444,7 @@
    return Status;
 }

-AGESA_STATUS agesawrapper_amds3finalrestore(void)
+static AGESA_STATUS amd_s3final_restore(void)
 {
    AGESA_STATUS Status;
    AMD_S3FINAL_PARAMS _S3FinalParams;
@@ -473,3 +473,55 @@

return Status;
 }
+
+static AGESA_STATUS romstage_dispatch(AMD_CONFIG_PARAMS *StdHeader)
+{
+	switch (StdHeader->Func) {
+	case AMD_INIT_RESET:
+		return amd_init_reset();
+	case AMD_INIT_EARLY:
+		return amd_init_early();
+	case AMD_INIT_POST:
+		return amd_init_post();
+	case AMD_INIT_RESUME:
+		return amd_init_resume();
+	default:
+		return AGESA_UNSUPPORTED;
+	}
+}
+
+static AGESA_STATUS ramstage_dispatch(AMD_CONFIG_PARAMS *StdHeader)
+{
+	switch (StdHeader->Func) {
+	case AMD_INIT_ENV:
+		return amd_init_env();
+	case AMD_INIT_MID:
+		return amd_init_mid();
+	case AMD_INIT_LATE:
+		return amd_init_late();
+	case AMD_INIT_RTB:
+		return amd_init_rtb();
+	case AMD_S3LATE_RESTORE:
+		return amd_s3late_restore();
+	case AMD_S3FINAL_RESTORE:
+		return amd_s3final_restore();
+	default:
+		return AGESA_UNSUPPORTED;
+	}
+}
+
+AGESA_STATUS agesa_execute_state(AGESA_STRUCT_NAME func)
+{
+	AGESA_STATUS status = AGESA_UNSUPPORTED;
+	AMD_CONFIG_PARAMS template = {};
+	AMD_CONFIG_PARAMS *StdHeader = &template;
+
+	StdHeader->Func = func;
+
+	if (ENV_ROMSTAGE)
+		status = romstage_dispatch(StdHeader);
+	if (ENV_RAMSTAGE)
+		status = ramstage_dispatch(StdHeader);
+
+	return status;
+}
diff --git a/src/soc/amd/common/block/pi/amd_late_init.c b/src/soc/amd/common/block/pi/amd_late_init.c
index fdecf00..80c7add 100644
--- a/src/soc/amd/common/block/pi/amd_late_init.c
+++ b/src/soc/amd/common/block/pi/amd_late_init.c
@@ -179,12 +179,12 @@
    if (acpi_is_wakeup_s3())
    	return;

-	do_agesawrapper(agesawrapper_amdinitlate, "amdinitlate");
+	do_agesawrapper(AMD_INIT_LATE, "amdinitlate");

if (!acpi_s3_resume_allowed())
    	return;

-	do_agesawrapper(agesawrapper_amdinitrtb, "amdinitrtb");
+	do_agesawrapper(AMD_INIT_RTB, "amdinitrtb");
 }

BOOT_STATE_INIT_ENTRY(BS_POST_DEVICE, BS_ON_EXIT, agesawrapper_post_device,
diff --git a/src/soc/amd/common/block/pi/amd_resume_final.c b/src/soc/amd/common/block/pi/amd_resume_final.c
index a282665..363ba83 100644
--- a/src/soc/amd/common/block/pi/amd_resume_final.c
+++ b/src/soc/amd/common/block/pi/amd_resume_final.c
@@ -18,7 +18,7 @@

static void agesawrapper_s3finalrestore(void *unused)
 {
-	do_agesawrapper(agesawrapper_amds3finalrestore, "amds3finalrestore");
+	do_agesawrapper(AMD_S3FINAL_RESTORE, "amds3finalrestore");
 }

BOOT_STATE_INIT_ENTRY(BS_OS_RESUME, BS_ON_ENTRY,
diff --git a/src/soc/amd/common/block/s3/Makefile.inc b/src/soc/amd/common/block/s3/Makefile.inc
index 7d950b0..9efc6bc 100644
--- a/src/soc/amd/common/block/s3/Makefile.inc
+++ b/src/soc/amd/common/block/s3/Makefile.inc
@@ -1,6 +1,6 @@
 ifeq ($(CONFIG_SOC_AMD_COMMON_BLOCK_S3),y)

-romstage-$(CONFIG_HAVE_ACPI_RESUME) += s3_resume.c
-ramstage-$(CONFIG_HAVE_ACPI_RESUME) += s3_resume.c
+romstage-y += s3_resume.c
+ramstage-y += s3_resume.c

endif
diff --git a/src/soc/amd/stoneyridge/chip.c b/src/soc/amd/stoneyridge/chip.c
index 1bd8cbf..033af6e 100644
--- a/src/soc/amd/stoneyridge/chip.c
+++ b/src/soc/amd/stoneyridge/chip.c
@@ -163,12 +163,11 @@
    		psp_load_named_blob(MBOX_BIOS_CMD_SMU_FW2, "smu_fw2");

post_code(0x47);
-		do_agesawrapper(agesawrapper_amdinitenv, "amdinitenv");
+		do_agesawrapper(AMD_INIT_ENV, "amdinitenv");
    } else {
    	/* Complete the initial system restoration */
    	post_code(0x46);
-		do_agesawrapper(agesawrapper_amds3laterestore,
-						"amds3laterestore");
+		do_agesawrapper(AMD_S3LATE_RESTORE, "amds3laterestore");
    }
 }

diff --git a/src/soc/amd/stoneyridge/northbridge.c b/src/soc/amd/stoneyridge/northbridge.c
index 927cce0..9380d1f 100644
--- a/src/soc/amd/stoneyridge/northbridge.c
+++ b/src/soc/amd/stoneyridge/northbridge.c
@@ -391,7 +391,7 @@
 {
    /* Must be called after PCI enumeration and resource allocation */
    if (!romstage_handoff_is_resume())
-		do_agesawrapper(agesawrapper_amdinitmid, "amdinitmid");
+		do_agesawrapper(AMD_INIT_MID, "amdinitmid");
 }

void domain_set_resources(struct device *dev)
diff --git a/src/soc/amd/stoneyridge/romstage.c b/src/soc/amd/stoneyridge/romstage.c
index f2263b7..92922c0 100644
--- a/src/soc/amd/stoneyridge/romstage.c
+++ b/src/soc/amd/stoneyridge/romstage.c
@@ -65,11 +65,11 @@
 static void agesa_call(void)
 {
    post_code(0x37);
-	do_agesawrapper(agesawrapper_amdinitreset, "amdinitreset");
+	do_agesawrapper(AMD_INIT_RESET, "amdinitreset");

post_code(0x38);
    /* APs will not exit amdinitearly */
-	do_agesawrapper(agesawrapper_amdinitearly, "amdinitearly");
+	do_agesawrapper(AMD_INIT_EARLY, "amdinitearly");
 }

static void bsp_agesa_call(void)
@@ -102,7 +102,7 @@

if (!s3_resume) {
    	post_code(0x40);
-		do_agesawrapper(agesawrapper_amdinitpost, "amdinitpost");
+		do_agesawrapper(AMD_INIT_POST, "amdinitpost");

post_code(0x41);
    	/*
@@ -137,7 +137,7 @@
    } else {
    	printk(BIOS_INFO, "S3 detected\n");
    	post_code(0x60);
-		do_agesawrapper(agesawrapper_amdinitresume, "amdinitresume");
+		do_agesawrapper(AMD_INIT_RESUME, "amdinitresume");

post_code(0x61);
    }