diff options
| author | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-05-24 09:06:03 +0300 |
|---|---|---|
| committer | Kyösti Mälkki <kyosti.malkki@gmail.com> | 2015-05-26 19:14:38 +0200 |
| commit | 90a54b087419faf15bef27f5dbd57e79de667f99 (patch) | |
| tree | 0c2d733c5a01d821e0796bb3082c495ec3411dfa /src/cpu/amd/agesa/s3_resume.c | |
| parent | 7138ee445c713867edd67c20fef10444f7aea6d1 (diff) | |
| download | coreboot-90a54b087419faf15bef27f5dbd57e79de667f99.tar.xz | |
AGESA: Move S3 related SPI writes again
This is more agesawrapper-related code than CPU.
Change-Id: I3058ef965a83aed1972e02f0f566f81d5dbd7adf
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: http://review.coreboot.org/10295
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
Diffstat (limited to 'src/cpu/amd/agesa/s3_resume.c')
| -rw-r--r-- | src/cpu/amd/agesa/s3_resume.c | 35 |
1 files changed, 1 insertions, 34 deletions
diff --git a/src/cpu/amd/agesa/s3_resume.c b/src/cpu/amd/agesa/s3_resume.c index 15a9ee4414..2ba684650a 100644 --- a/src/cpu/amd/agesa/s3_resume.c +++ b/src/cpu/amd/agesa/s3_resume.c @@ -34,40 +34,6 @@ #include <northbridge/amd/agesa/BiosCallOuts.h> #include "s3_resume.h" -/* The size needs to be 4k aligned, which is the sector size of most flashes. */ -#define S3_DATA_VOLATILE_SIZE 0x6000 -#define S3_DATA_MTRR_SIZE 0x1000 -#define S3_DATA_NONVOLATILE_SIZE 0x1000 - -#if IS_ENABLED(CONFIG_HAVE_ACPI_RESUME) && \ - (S3_DATA_VOLATILE_SIZE + S3_DATA_MTRR_SIZE + S3_DATA_NONVOLATILE_SIZE) > CONFIG_S3_DATA_SIZE -#error "Please increase the value of S3_DATA_SIZE" -#endif - -static void get_s3nv_data(S3_DATA_TYPE S3DataType, u32 *pos, u32 *len) -{ - /* FIXME: Find file from CBFS. */ - u32 s3_data = CONFIG_S3_DATA_POS; - - switch (S3DataType) { - case S3DataTypeVolatile: - *pos = s3_data; - *len = S3_DATA_VOLATILE_SIZE; - break; - case S3DataTypeMTRR: - *pos = s3_data + S3_DATA_VOLATILE_SIZE; - *len = S3_DATA_MTRR_SIZE; - break; - case S3DataTypeNonVolatile: - *pos = s3_data + S3_DATA_VOLATILE_SIZE + S3_DATA_MTRR_SIZE; - *len = S3_DATA_NONVOLATILE_SIZE; - break; - default: - *pos = 0; - *len = 0; - break; - } -} void restore_mtrr(void) { @@ -173,6 +139,7 @@ static void move_stack_high_mem(void) #ifndef __PRE_RAM__ /* FIXME: Why store MTRR in SPI, just use CBMEM ? */ +#define S3_DATA_MTRR_SIZE 0x1000 static u8 mtrr_store[S3_DATA_MTRR_SIZE]; static void write_mtrr(u8 **p_nvram_pos, unsigned idx) |