diff options
author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-03-29 15:53:54 +0300 |
---|---|---|
committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2017-04-04 02:23:39 +0200 |
commit | 424c63950bedc76020a0861ee85c19bf26eb4c6a (patch) | |
tree | 2ed155d910d0645e432c552acdad27e8096f7004 /src/northbridge/amd | |
parent | 85782b21527b54ae5ac496bf27c1416e4d6aae68 (diff) | |
download | coreboot-424c63950bedc76020a0861ee85c19bf26eb4c6a.tar.xz |
AGESA: Refactor S3 support functions
Producer and consumer of these buffers now appear in same file.
Also add test for uninitialized NonVolatileStorage in SPI.
Change-Id: Ibbf6581a0bf1d4bffda870fc055721627b538b92
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/19037
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/northbridge/amd')
-rw-r--r-- | src/northbridge/amd/agesa/agesa_helper.h | 1 | ||||
-rw-r--r-- | src/northbridge/amd/agesa/oem_s3.c | 31 |
2 files changed, 20 insertions, 12 deletions
diff --git a/src/northbridge/amd/agesa/agesa_helper.h b/src/northbridge/amd/agesa/agesa_helper.h index 82963c1f04..ee7ab92ddd 100644 --- a/src/northbridge/amd/agesa/agesa_helper.h +++ b/src/northbridge/amd/agesa/agesa_helper.h @@ -37,7 +37,6 @@ void amd_initenv(void); void *GetHeapBase(void); void EmptyHeap(void); -void ResumeHeap(void **heap, size_t *len); #define BSP_STACK_BASE_ADDR 0x30000 diff --git a/src/northbridge/amd/agesa/oem_s3.c b/src/northbridge/amd/agesa/oem_s3.c index 525bfabafb..e3d58c21d0 100644 --- a/src/northbridge/amd/agesa/oem_s3.c +++ b/src/northbridge/amd/agesa/oem_s3.c @@ -61,24 +61,33 @@ static void get_s3nv_data(S3_DATA_TYPE S3DataType, uintptr_t *pos, uintptr_t *le AGESA_STATUS OemInitResume(AMD_S3_PARAMS *dataBlock) { uintptr_t pos, size; - get_s3nv_data(S3DataTypeNonVolatile, &pos, &size); - /* TODO: Our NvStorage is really const. */ - dataBlock->NvStorageSize = *(UINT32 *) pos; - dataBlock->NvStorage = (void *) (pos + sizeof(UINT32)); + u32 len = *(u32*)pos; + + /* Test for uninitialized s3nv data in SPI. */ + if (len == 0 || len == (u32)-1ULL) + return AGESA_FATAL; + + dataBlock->NvStorageSize = len; + dataBlock->NvStorage = (void *) (pos + sizeof(u32)); return AGESA_SUCCESS; } AGESA_STATUS OemS3LateRestore(AMD_S3_PARAMS *dataBlock) { - void *dst; - size_t len; - - ResumeHeap(&dst, &len); - dataBlock->VolatileStorageSize = len; - dataBlock->VolatileStorage = dst; - + char *heap = cbmem_find(CBMEM_ID_RESUME_SCRATCH); + if (heap == NULL) + return AGESA_FATAL; + + printk(BIOS_DEBUG, "Using resume HEAP at %08x\n", + (unsigned int)(uintptr_t) heap); + + /* Return allocated CBMEM size, we do not keep track of + * how much was actually used. + */ + dataBlock->VolatileStorageSize = HIGH_MEMORY_SCRATCH; + dataBlock->VolatileStorage = heap; return AGESA_SUCCESS; } |