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 <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31510
Reviewed-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>

8 files changed, 31 insertions, 5 deletions

diff --git a/src/drivers/amd/agesa/eventlog.c b/src/drivers/amd/agesa/eventlog.c
index 6cfcde520b..23e31ba7d3 100644
--- a/src/drivers/amd/agesa/eventlog.c
+++ b/src/drivers/amd/agesa/eventlog.c
@@ -29,8 +29,9 @@ static const char undefined[] = "undefined";
 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 179c3f5da0..31c0b347a0 100644
--- a/src/vendorcode/amd/agesa/f12/AMD.h
+++ b/src/vendorcode/amd/agesa/f12/AMD.h
@@ -148,7 +148,10 @@ typedef enum {
   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 9d443beb1e..c1cfaa1f32 100644
--- a/src/vendorcode/amd/agesa/f14/AMD.h
+++ b/src/vendorcode/amd/agesa/f14/AMD.h
@@ -147,7 +147,10 @@ typedef enum {
   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 31d38db556..27326ecef8 100644
--- a/src/vendorcode/amd/agesa/f15tn/AMD.h
+++ b/src/vendorcode/amd/agesa/f15tn/AMD.h
@@ -144,7 +144,10 @@ typedef enum {
   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 bfce993bce..83d538f3e2 100644
--- a/src/vendorcode/amd/agesa/f16kb/AMD.h
+++ b/src/vendorcode/amd/agesa/f16kb/AMD.h
@@ -143,7 +143,9 @@ typedef enum {
   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 68f7c32818..f70b128508 100644
--- a/src/vendorcode/amd/pi/00630F01/AMD.h
+++ b/src/vendorcode/amd/pi/00630F01/AMD.h
@@ -149,6 +149,8 @@ typedef enum {
   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 aa68204e8d..54abf80af0 100644
--- a/src/vendorcode/amd/pi/00660F01/AMD.h
+++ b/src/vendorcode/amd/pi/00660F01/AMD.h
@@ -126,6 +126,11 @@ typedef enum ACCESS_WIDTH {
   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 @@ typedef enum {
   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 1b6fdb26e8..13fc29afeb 100644
--- a/src/vendorcode/amd/pi/00730F01/AMD.h
+++ b/src/vendorcode/amd/pi/00730F01/AMD.h
@@ -148,6 +148,9 @@ typedef enum {
   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,