soc/amd/common: Refactor S3 helpers
Make the prototypes match what drivers/amd/agesa would
rather see, in preparation to use the same code with
open-source AGESA.
Change-Id: I1506ee2f7ecf3cb6ec4cce37a030c05f78ec6d59
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/31490
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Martin Roth <martinroth@google.com>
diff --git a/src/soc/amd/common/block/s3/s3_resume.c b/src/soc/amd/common/block/s3/s3_resume.c
index 74aa79c..598036a 100644
--- a/src/soc/amd/common/block/s3/s3_resume.c
+++ b/src/soc/amd/common/block/s3/s3_resume.c
@@ -26,56 +26,73 @@
/* Training data versioning is not supported or tracked. */
#define DEFAULT_MRC_VERSION 0
-static void reboot_from_resume(const char *message) /* Does not return */
+static void __noreturn reboot_from_resume(const char *message)
{
printk(BIOS_ERR, "%s", message);
set_pm1cnt_s5();
board_reset();
}
-void get_s3nv_info(void **base, size_t *size)
+AGESA_STATUS OemInitResume(S3_DATA_BLOCK *dataBlock)
{
+ void *base;
+ size_t size;
+ int i;
+ uint32_t erased = 0xffffffff;
struct region_device rdev;
if (mrc_cache_get_current(MRC_TRAINING_DATA, DEFAULT_MRC_VERSION,
&rdev))
reboot_from_resume("mrc_cache_get_current error, rebooting.\n");
- *base = rdev_mmap_full(&rdev);
- *size = region_device_sz(&rdev);
- if (!*base || !*size)
+ base = rdev_mmap_full(&rdev);
+ size = region_device_sz(&rdev);
+ if (!base || !size)
reboot_from_resume("Error: S3 NV data not found, rebooting.\n");
/* Read 16 bytes to infer if the NV has been erased from flash. */
- int i;
- uint32_t erased = 0xffffffff;
for (i = 0; i < 4; i++)
- erased &= read32((uint32_t *)*base + i);
-
+ erased &= read32((uint32_t *)base + i);
if (erased == 0xffffffff)
reboot_from_resume("Error: S3 NV data invalid, rebooting.\n");
- printk(BIOS_SPEW, "S3 NV data @0x%p, 0x%0zx bytes\n", *base, *size);
+ dataBlock->NvStorage = base;
+ dataBlock->NvStorageSize = size;
+ printk(BIOS_SPEW, "S3 NV data @0x%p, 0x%0zx bytes\n",
+ dataBlock->NvStorage, (size_t)dataBlock->NvStorageSize);
+
+ return AGESA_SUCCESS;
}
-void get_s3vol_info(void **base, size_t *size)
+AGESA_STATUS OemS3LateRestore(S3_DATA_BLOCK *dataBlock)
{
- stage_cache_get_raw(STAGE_S3_DATA, base, size);
- if (!*base || !*size)
+ void *base = NULL;
+ size_t size = 0;
+
+ stage_cache_get_raw(STAGE_S3_DATA, &base, &size);
+ if (!base || !size) {
printk(BIOS_ERR, "Error: S3 volatile data not found\n");
- else
- printk(BIOS_SPEW, "S3 volatile data @0x%p 0x%0zx total bytes\n",
- *base, *size);
-}
-
-int save_s3_info(void *nv_base, size_t nv_size, void *vol_base, size_t vol_size)
-{
- if (mrc_cache_stash_data(MRC_TRAINING_DATA, DEFAULT_MRC_VERSION,
- nv_base, nv_size) < 0) {
- printk(BIOS_ERR, "Failed to stash MRC data\n");
- return -1;
+ return AGESA_FATAL;
}
- stage_cache_add_raw(STAGE_S3_DATA, vol_base, vol_size);
- return 0;
+ dataBlock->VolatileStorage = base;
+ dataBlock->VolatileStorageSize = size;
+ printk(BIOS_SPEW, "S3 volatile data @0x%p, 0x%0zx bytes\n",
+ dataBlock->VolatileStorage, (size_t)dataBlock->VolatileStorageSize);
+
+ return AGESA_SUCCESS;
+}
+
+AGESA_STATUS OemS3Save(S3_DATA_BLOCK *dataBlock)
+{
+ if (mrc_cache_stash_data(MRC_TRAINING_DATA, DEFAULT_MRC_VERSION,
+ dataBlock->NvStorage, dataBlock->NvStorageSize) < 0) {
+ printk(BIOS_ERR, "Failed to stash MRC data\n");
+ return AGESA_CRITICAL;
+ }
+
+ stage_cache_add_raw(STAGE_S3_DATA, dataBlock->VolatileStorage,
+ dataBlock->VolatileStorageSize);
+
+ return AGESA_SUCCESS;
}