diff options
| author | Timothy Pearson <tpearson@raptorengineeringinc.com> | 2015-05-31 18:46:40 -0500 |
|---|---|---|
| committer | Martin Roth <martinroth@google.com> | 2015-11-02 23:36:37 +0100 |
| commit | 69b11f9d407057f0ea76784ecb0e9970cb7d0991 (patch) | |
| tree | 15bcb055e9b622f56420883dea1d8a705c79d7e1 /src/northbridge | |
| parent | 502d457bf9c43e7b100007ca66fd8d61f49ffa61 (diff) | |
northbridge/amd/amdmct/mct_ddr3: Fix S3 suspend overrunning the stack size limit
Change-Id: Id7441dacef2e46e283d1fc99d5e5fa3f20e0d097
Signed-off-by: Timothy Pearson <tpearson@raptorengineeringinc.com>
Reviewed-on: http://review.coreboot.org/11959
Tested-by: build bot (Jenkins)
Reviewed-by: Martin Roth <martinroth@google.com>
Diffstat (limited to 'src/northbridge')
| -rw-r--r-- | src/northbridge/amd/amdmct/mct_ddr3/s3utils.c | 16 |
1 files changed, 13 insertions, 3 deletions
diff --git a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c index 34c52ac067..4b745d2846 100644 --- a/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c +++ b/src/northbridge/amd/amdmct/mct_ddr3/s3utils.c @@ -539,10 +539,17 @@ int8_t save_mct_information_to_nvram(void) struct spi_flash *flash; ssize_t s3nv_offset; - struct amd_s3_persistent_data persistent_data; + struct amd_s3_persistent_data *persistent_data; + + /* Allocate temporary data structures */ + persistent_data = malloc(sizeof(struct amd_s3_persistent_data)); + if (!persistent_data) { + printk(BIOS_DEBUG, "Could not allocate S3 data structure in RAM\n"); + return -1; + } /* Obtain MCT configuration data */ - copy_mct_data_to_save_variable(&persistent_data); + copy_mct_data_to_save_variable(persistent_data); /* Obtain CBFS file offset */ s3nv_offset = get_s3nv_file_offset(); @@ -572,7 +579,10 @@ int8_t save_mct_information_to_nvram(void) /* Erase and write data structure */ flash->erase(flash, s3nv_offset, CONFIG_S3_DATA_SIZE); - flash->write(flash, s3nv_offset, sizeof(struct amd_s3_persistent_data), &persistent_data); + flash->write(flash, s3nv_offset, sizeof(struct amd_s3_persistent_data), persistent_data); + + /* Deallocate temporary data structures */ + free(persistent_data); /* Tear down SPI flash access */ flash->spi->rw = SPI_WRITE_FLAG; |