Change in ...coreboot[master]: AGESA binaryPI: Sync STRUCT_NAME definitions

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

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

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

AGESA binaryPI: Sync STRUCT_NAME definitions

While not implemented, copying the definitions from
later AGESA/AMD.h to older helps us avoid lots of

Change-Id: I34edc1ca23e9c063c4286273c53249ff0a953798
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/amd/agesa/eventlog.c
M src/vendorcode/amd/agesa/f12/AMD.h
M src/vendorcode/amd/agesa/f14/AMD.h
M src/vendorcode/amd/agesa/f15tn/AMD.h
M src/vendorcode/amd/agesa/f16kb/AMD.h
M src/vendorcode/amd/pi/00630F01/AMD.h
M src/vendorcode/amd/pi/00660F01/AMD.h
M src/vendorcode/amd/pi/00730F01/AMD.h
8 files changed, 31 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/31510/1

diff --git a/src/drivers/amd/agesa/eventlog.c b/src/drivers/amd/agesa/eventlog.c
index cc65652..3231d4f 100644
--- a/src/drivers/amd/agesa/eventlog.c
+++ b/src/drivers/amd/agesa/eventlog.c
@@ -29,8 +29,9 @@
 static const char *AgesaFunctionNameStr[] = {
    "AmdInitRecovery", "AmdCreateStruct", "AmdInitEarly", "AmdInitEnv", "AmdInitLate",
    "AmdInitMid", "AmdInitPost", "AmdInitReset", "AmdInitResume", "AmdReleaseStruct",
-	"AmdS3LateRestore","AmdS3Save", "AmdGetApicId", "AmdGetPciAddress", "AmdIdentifyCore",
+	"AmdS3LateRestore", "AmdS3Save", "AmdGetApicId", "AmdGetPciAddress", "AmdIdentifyCore",
    "AmdReadEventLog", "AmdGetAvailableExeCacheSize", "AmdLateRunApTask", "AmdIdentifyDimm",
+	"Amd2dDataEye", "AmdS3FinalRestore", "AmdInitRtb"
 };

/* heapManager.h */
diff --git a/src/vendorcode/amd/agesa/f12/AMD.h b/src/vendorcode/amd/agesa/f12/AMD.h
index 179c3f5..31c0b34 100644
--- a/src/vendorcode/amd/agesa/f12/AMD.h
+++ b/src/vendorcode/amd/agesa/f12/AMD.h
@@ -148,7 +148,10 @@
   AMD_READ_EVENT_LOG,                                       ///< AmdReadEventLog general service handle
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
-  AMD_IDENTIFY_DIMMS                                        ///< AmdIdentifyDimm general service handle
+  AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/agesa/f14/AMD.h b/src/vendorcode/amd/agesa/f14/AMD.h
index 9d443be..c1cfaa1 100644
--- a/src/vendorcode/amd/agesa/f14/AMD.h
+++ b/src/vendorcode/amd/agesa/f14/AMD.h
@@ -147,7 +147,10 @@
   AMD_READ_EVENT_LOG,                                       ///< AmdReadEventLog general service handle
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
-  AMD_IDENTIFY_DIMMS                                        ///< AmdIdentifyDimm general service handle
+  AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/agesa/f15tn/AMD.h b/src/vendorcode/amd/agesa/f15tn/AMD.h
index 31d38db..27326ec 100644
--- a/src/vendorcode/amd/agesa/f15tn/AMD.h
+++ b/src/vendorcode/amd/agesa/f15tn/AMD.h
@@ -144,7 +144,10 @@
   AMD_READ_EVENT_LOG,                                       ///< AmdReadEventLog general service handle
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
-  AMD_IDENTIFY_DIMMS                                        ///< AmdIdentifyDimm general service handle
+  AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/agesa/f16kb/AMD.h b/src/vendorcode/amd/agesa/f16kb/AMD.h
index bfce993..83d538f 100644
--- a/src/vendorcode/amd/agesa/f16kb/AMD.h
+++ b/src/vendorcode/amd/agesa/f16kb/AMD.h
@@ -143,7 +143,9 @@
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
   AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
-  AMD_GET_2D_DATA_EYE                                       ///< AmdGet2DDataEye general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/pi/00630F01/AMD.h b/src/vendorcode/amd/pi/00630F01/AMD.h
index 68f7c32..f70b128 100644
--- a/src/vendorcode/amd/pi/00630F01/AMD.h
+++ b/src/vendorcode/amd/pi/00630F01/AMD.h
@@ -149,6 +149,8 @@
   AMD_IDENTIFY_DIMMS         = 0x00033000,                  ///< AmdIdentifyDimm general service handle
   AMD_GET_2D_DATA_EYE        = 0x00034000,                  ///< AmdGet2DDataEye general service handle
   AMD_S3FINAL_RESTORE        = 0x00035000,                  ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB               = 0x00036000, /* reserved */
+
   AMD_HEAP_ALLOCATE_BUFFER   = 0x00038000,
   AMD_HEAP_DEALLOCATE_BUFFER = 0x00039000,
   FCH_INIT_RESET             = 0x00040000,
diff --git a/src/vendorcode/amd/pi/00660F01/AMD.h b/src/vendorcode/amd/pi/00660F01/AMD.h
index aa68204..54abf80 100644
--- a/src/vendorcode/amd/pi/00660F01/AMD.h
+++ b/src/vendorcode/amd/pi/00660F01/AMD.h
@@ -126,6 +126,11 @@
   AccessS3SaveWidth64,                                      ///< Save 64 bits data.
 } ACCESS_WIDTH;

+/* When AMD rolled out CarrizoPI, they made a bad choice of removing
+ * an entry from the middle of the enumeration list.
+ */
+#define AMD_S3_SAVE_REMOVED
+
 /// AGESA struct name
 typedef enum {
   // AGESA BASIC FUNCTIONS
@@ -140,6 +145,10 @@
   AMD_INIT_RESUME            = 0x00029000,                                          ///< AmdInitResume entry point handle
   AMD_RELEASE_STRUCT         = 0x0002A000,                                       ///< AmdReleaseStruct handle
   AMD_S3LATE_RESTORE         = 0x0002B000,                                       ///< AmdS3LateRestore entry point handle
+#if 0
+  /* This was removed, shifting everything else up.*/
+  AMD_S3_SAVE                = 0x0002C000,
+#endif
   AMD_GET_APIC_ID            = 0x0002C000,                                          ///< AmdGetApicId entry point handle
   AMD_GET_PCI_ADDRESS        = 0x0002D000,                               ///< AmdGetPciAddress entry point handle
   AMD_IDENTIFY_CORE          = 0x0002E000,                                        ///< AmdIdentifyCore general service handle
diff --git a/src/vendorcode/amd/pi/00730F01/AMD.h b/src/vendorcode/amd/pi/00730F01/AMD.h
index 1b6fdb2..13fc29a 100644
--- a/src/vendorcode/amd/pi/00730F01/AMD.h
+++ b/src/vendorcode/amd/pi/00730F01/AMD.h
@@ -148,6 +148,9 @@
   AMD_LATE_RUN_AP_TASK       = 0x00032000,                  ///< AmdLateRunApTask entry point handle
   AMD_IDENTIFY_DIMMS         = 0x00033000,                  ///< AmdIdentifyDimm general service handle
   AMD_GET_2D_DATA_EYE        = 0x00034000,                  ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE        = 0x00035000, /* reserved */
+  AMD_INIT_RTB               = 0x00036000, /* reserved */
+
   AMD_HEAP_ALLOCATE_BUFFER   = 0x00038000,
   AMD_HEAP_DEALLOCATE_BUFFER = 0x00039000,
   FCH_INIT_RESET             = 0x00040000,

[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/+/31510

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

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

AGESA binaryPI: Sync STRUCT_NAME definitions

While not implemented, copying the definitions from
later AGESA/AMD.h to older helps us avoid lots of
preprocessor directives.

Change-Id: I34edc1ca23e9c063c4286273c53249ff0a953798
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/amd/agesa/eventlog.c
M src/vendorcode/amd/agesa/f12/AMD.h
M src/vendorcode/amd/agesa/f14/AMD.h
M src/vendorcode/amd/agesa/f15tn/AMD.h
M src/vendorcode/amd/agesa/f16kb/AMD.h
M src/vendorcode/amd/pi/00630F01/AMD.h
M src/vendorcode/amd/pi/00660F01/AMD.h
M src/vendorcode/amd/pi/00730F01/AMD.h
8 files changed, 31 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/31510/2

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

Hello Marshall Dawson, build bot (Jenkins), Martin Roth,

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

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

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

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

AGESA binaryPI: Sync STRUCT_NAME definitions

While not implemented, copying the definitions from
later AGESA/AMD.h to older helps us avoid lots of

Change-Id: I34edc1ca23e9c063c4286273c53249ff0a953798
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/amd/agesa/eventlog.c
M src/vendorcode/amd/agesa/f12/AMD.h
M src/vendorcode/amd/agesa/f14/AMD.h
M src/vendorcode/amd/agesa/f15tn/AMD.h
M src/vendorcode/amd/agesa/f16kb/AMD.h
M src/vendorcode/amd/pi/00630F01/AMD.h
M src/vendorcode/amd/pi/00660F01/AMD.h
M src/vendorcode/amd/pi/00730F01/AMD.h
8 files changed, 31 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/31510/3

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31510 )

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/31510/3/src/drivers/amd/agesa/eventlog.c 
File src/drivers/amd/agesa/eventlog.c:

https://review.coreboot.org/#/c/31510/3/src/drivers/amd/agesa/eventlog.c@32 
PS3, Line 32: 	"AmdS3LateRestore", "AmdS3Save", "AmdGetApicId", "AmdGetPciAddress", "AmdIdentifyCore",
line over 80 characters

[Angel Pons (Code Review)]

Angel Pons has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31510 )

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

Patch Set 3:

(1 comment)

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

https://review.coreboot.org/#/c/31510/3//COMMIT_MSG@10 
PS3, Line 10: lots of
            : 
lots of what?

[Marshall Dawson (Code Review)]

Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31510 )

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

Patch Set 3:

(1 comment)

https://review.coreboot.org/#/c/31510/3/src/vendorcode/amd/pi/00660F01/AMD.h 
File src/vendorcode/amd/pi/00660F01/AMD.h:

https://review.coreboot.org/#/c/31510/3/src/vendorcode/amd/pi/00660F01/AMD.h... 
PS3, Line 129: /* When AMD rolled out CarrizoPI, they made a bad choice of removing
             :  * an entry from the middle of the enumeration list.
             :  */
If I understand the history correctly, AmdS3Save was deprecated in favor of AmdInitRtb.  The spec says "Both entry names will be supported for a time to maintain backward compatibility in present systems".  No idea how old that note is, but my guess is CZ finally did away with AmdS3Save inside the PI.

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

Hello Marshall Dawson, build bot (Jenkins), Martin Roth,

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

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

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

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

AGESA binaryPI: Sync STRUCT_NAME definitions

While not implemented, copying the definitions from
later AGESA/AMD.h to older helps us avoid lots of
preprocessor directives.

Change-Id: I34edc1ca23e9c063c4286273c53249ff0a953798
Signed-off-by: Kyösti Mälkki 
---
M src/drivers/amd/agesa/eventlog.c
M src/vendorcode/amd/agesa/f12/AMD.h
M src/vendorcode/amd/agesa/f14/AMD.h
M src/vendorcode/amd/agesa/f15tn/AMD.h
M src/vendorcode/amd/agesa/f16kb/AMD.h
M src/vendorcode/amd/pi/00630F01/AMD.h
M src/vendorcode/amd/pi/00660F01/AMD.h
M src/vendorcode/amd/pi/00730F01/AMD.h
8 files changed, 31 insertions(+), 5 deletions(-)

git pull ssh://review.coreboot.org:29418/coreboot refs/changes/10/31510/4

[build bot (Jenkins) (Code Review)]

build bot (Jenkins) has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31510 )

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/#/c/31510/4/src/drivers/amd/agesa/eventlog.c 
File src/drivers/amd/agesa/eventlog.c:

https://review.coreboot.org/#/c/31510/4/src/drivers/amd/agesa/eventlog.c@32 
PS4, Line 32: 	"AmdS3LateRestore", "AmdS3Save", "AmdGetApicId", "AmdGetPciAddress", "AmdIdentifyCore",
line over 80 characters

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

Kyösti Mälkki has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31510 )

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

Patch Set 4:

(1 comment)

https://review.coreboot.org/#/c/31510/3/src/vendorcode/amd/pi/00660F01/AMD.h 
File src/vendorcode/amd/pi/00660F01/AMD.h:

https://review.coreboot.org/#/c/31510/3/src/vendorcode/amd/pi/00660F01/AMD.h... 
PS3, Line 129: /* When AMD rolled out CarrizoPI, they made a bad choice of removing
             :  * an entry from the middle of the enumeration list.
             :  */
> If I understand the history correctly, AmdS3Save was deprecated in favor of AmdInitRtb. […]

Simply not supporting it is one thing, dropping it from the list of enumerations within the same major revision of AGESA spec another.

A related struct was also renamed from AMD_S3_PARAMS to S3_DATA_BLOCK, although that made some sense for symmetry.

[Marshall Dawson (Code Review)]

Marshall Dawson has posted comments on this change. ( https://review.coreboot.org/c/coreboot/+/31510 )

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

Patch Set 5: Code-Review+2

[Patrick Georgi (Code Review)]

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

Change subject: AGESA binaryPI: Sync STRUCT_NAME definitions
......................................................................

AGESA binaryPI: Sync STRUCT_NAME definitions

While not implemented, copying the definitions from
later AGESA/AMD.h to older helps us avoid lots of
preprocessor directives.

Change-Id: I34edc1ca23e9c063c4286273c53249ff0a953798
Signed-off-by: Kyösti Mälkki 
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31510
Reviewed-by: Marshall Dawson 
Tested-by: build bot (Jenkins) 
---
M src/drivers/amd/agesa/eventlog.c
M src/vendorcode/amd/agesa/f12/AMD.h
M src/vendorcode/amd/agesa/f14/AMD.h
M src/vendorcode/amd/agesa/f15tn/AMD.h
M src/vendorcode/amd/agesa/f16kb/AMD.h
M src/vendorcode/amd/pi/00630F01/AMD.h
M src/vendorcode/amd/pi/00660F01/AMD.h
M src/vendorcode/amd/pi/00730F01/AMD.h
8 files changed, 31 insertions(+), 5 deletions(-)

Approvals:
  build bot (Jenkins): Verified
  Marshall Dawson: Looks good to me, approved

diff --git a/src/drivers/amd/agesa/eventlog.c b/src/drivers/amd/agesa/eventlog.c
index 6cfcde5..23e31ba 100644
--- a/src/drivers/amd/agesa/eventlog.c
+++ b/src/drivers/amd/agesa/eventlog.c
@@ -29,8 +29,9 @@
 static const char *AgesaFunctionNameStr[] = {
    "AmdInitRecovery", "AmdCreateStruct", "AmdInitEarly", "AmdInitEnv", "AmdInitLate",
    "AmdInitMid", "AmdInitPost", "AmdInitReset", "AmdInitResume", "AmdReleaseStruct",
-	"AmdS3LateRestore","AmdS3Save", "AmdGetApicId", "AmdGetPciAddress", "AmdIdentifyCore",
+	"AmdS3LateRestore", "AmdS3Save", "AmdGetApicId", "AmdGetPciAddress", "AmdIdentifyCore",
    "AmdReadEventLog", "AmdGetAvailableExeCacheSize", "AmdLateRunApTask", "AmdIdentifyDimm",
+	"Amd2dDataEye", "AmdS3FinalRestore", "AmdInitRtb"
 };

/* heapManager.h */
diff --git a/src/vendorcode/amd/agesa/f12/AMD.h b/src/vendorcode/amd/agesa/f12/AMD.h
index 179c3f5..31c0b34 100644
--- a/src/vendorcode/amd/agesa/f12/AMD.h
+++ b/src/vendorcode/amd/agesa/f12/AMD.h
@@ -148,7 +148,10 @@
   AMD_READ_EVENT_LOG,                                       ///< AmdReadEventLog general service handle
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
-  AMD_IDENTIFY_DIMMS                                        ///< AmdIdentifyDimm general service handle
+  AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/agesa/f14/AMD.h b/src/vendorcode/amd/agesa/f14/AMD.h
index 9d443be..c1cfaa1 100644
--- a/src/vendorcode/amd/agesa/f14/AMD.h
+++ b/src/vendorcode/amd/agesa/f14/AMD.h
@@ -147,7 +147,10 @@
   AMD_READ_EVENT_LOG,                                       ///< AmdReadEventLog general service handle
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
-  AMD_IDENTIFY_DIMMS                                        ///< AmdIdentifyDimm general service handle
+  AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/agesa/f15tn/AMD.h b/src/vendorcode/amd/agesa/f15tn/AMD.h
index 31d38db..27326ec 100644
--- a/src/vendorcode/amd/agesa/f15tn/AMD.h
+++ b/src/vendorcode/amd/agesa/f15tn/AMD.h
@@ -144,7 +144,10 @@
   AMD_READ_EVENT_LOG,                                       ///< AmdReadEventLog general service handle
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
-  AMD_IDENTIFY_DIMMS                                        ///< AmdIdentifyDimm general service handle
+  AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/agesa/f16kb/AMD.h b/src/vendorcode/amd/agesa/f16kb/AMD.h
index bfce993..83d538f 100644
--- a/src/vendorcode/amd/agesa/f16kb/AMD.h
+++ b/src/vendorcode/amd/agesa/f16kb/AMD.h
@@ -143,7 +143,9 @@
   AMD_GET_EXECACHE_SIZE,                                    ///< AmdGetAvailableExeCacheSize general service handle
   AMD_LATE_RUN_AP_TASK,                                     ///< AmdLateRunApTask entry point handle
   AMD_IDENTIFY_DIMMS,                                       ///< AmdIdentifyDimm general service handle
-  AMD_GET_2D_DATA_EYE                                       ///< AmdGet2DDataEye general service handle
+  AMD_GET_2D_DATA_EYE,                                      ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE,                                      ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB                                              ///< AmdInitRtb entry point handle
 } AGESA_STRUCT_NAME;

/*  ResetType constant values */
diff --git a/src/vendorcode/amd/pi/00630F01/AMD.h b/src/vendorcode/amd/pi/00630F01/AMD.h
index 68f7c32..f70b128 100644
--- a/src/vendorcode/amd/pi/00630F01/AMD.h
+++ b/src/vendorcode/amd/pi/00630F01/AMD.h
@@ -149,6 +149,8 @@
   AMD_IDENTIFY_DIMMS         = 0x00033000,                  ///< AmdIdentifyDimm general service handle
   AMD_GET_2D_DATA_EYE        = 0x00034000,                  ///< AmdGet2DDataEye general service handle
   AMD_S3FINAL_RESTORE        = 0x00035000,                  ///< AmdS3FinalRestore entry point handle
+  AMD_INIT_RTB               = 0x00036000, /* reserved */
+
   AMD_HEAP_ALLOCATE_BUFFER   = 0x00038000,
   AMD_HEAP_DEALLOCATE_BUFFER = 0x00039000,
   FCH_INIT_RESET             = 0x00040000,
diff --git a/src/vendorcode/amd/pi/00660F01/AMD.h b/src/vendorcode/amd/pi/00660F01/AMD.h
index aa68204..54abf80 100644
--- a/src/vendorcode/amd/pi/00660F01/AMD.h
+++ b/src/vendorcode/amd/pi/00660F01/AMD.h
@@ -126,6 +126,11 @@
   AccessS3SaveWidth64,                                      ///< Save 64 bits data.
 } ACCESS_WIDTH;

+/* When AMD rolled out CarrizoPI, they made a bad choice of removing
+ * an entry from the middle of the enumeration list.
+ */
+#define AMD_S3_SAVE_REMOVED
+
 /// AGESA struct name
 typedef enum {
   // AGESA BASIC FUNCTIONS
@@ -140,6 +145,10 @@
   AMD_INIT_RESUME            = 0x00029000,                                          ///< AmdInitResume entry point handle
   AMD_RELEASE_STRUCT         = 0x0002A000,                                       ///< AmdReleaseStruct handle
   AMD_S3LATE_RESTORE         = 0x0002B000,                                       ///< AmdS3LateRestore entry point handle
+#if 0
+  /* This was removed, shifting everything else up.*/
+  AMD_S3_SAVE                = 0x0002C000,
+#endif
   AMD_GET_APIC_ID            = 0x0002C000,                                          ///< AmdGetApicId entry point handle
   AMD_GET_PCI_ADDRESS        = 0x0002D000,                               ///< AmdGetPciAddress entry point handle
   AMD_IDENTIFY_CORE          = 0x0002E000,                                        ///< AmdIdentifyCore general service handle
diff --git a/src/vendorcode/amd/pi/00730F01/AMD.h b/src/vendorcode/amd/pi/00730F01/AMD.h
index 1b6fdb2..13fc29a 100644
--- a/src/vendorcode/amd/pi/00730F01/AMD.h
+++ b/src/vendorcode/amd/pi/00730F01/AMD.h
@@ -148,6 +148,9 @@
   AMD_LATE_RUN_AP_TASK       = 0x00032000,                  ///< AmdLateRunApTask entry point handle
   AMD_IDENTIFY_DIMMS         = 0x00033000,                  ///< AmdIdentifyDimm general service handle
   AMD_GET_2D_DATA_EYE        = 0x00034000,                  ///< AmdGet2DDataEye general service handle
+  AMD_S3FINAL_RESTORE        = 0x00035000, /* reserved */
+  AMD_INIT_RTB               = 0x00036000, /* reserved */
+
   AMD_HEAP_ALLOCATE_BUFFER   = 0x00038000,
   AMD_HEAP_DEALLOCATE_BUFFER = 0x00039000,
   FCH_INIT_RESET             = 0x00040000,