GNUBoot
/
coreboot-kgpe-d16
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AMD S3 resume: use a function to replace duplicated code 

In function OemAgesaSaveMtrr of 'src/cpu/amd/agesa/s3_resume.c',
there are many code like this:
  msr_data = rdmsr(0x258);
  flash->write(flash, nvram_pos, 4, &msr_data.lo);
  nvram_pos += 4;
  flash->write(flash, nvram_pos, 4, &msr_data.hi);
  nvram_pos += 4;
Add a function write_mtrr to do this.

Change-Id: Id6464e637db1758b07ac2d79d3be1375a8d49651
Signed-off-by: Siyuan Wang <SiYuan.Wang@amd.com>
Signed-off-by: Siyuan Wang <wangsiyuanbuaa@gmail.com>
Reviewed-on: http://review.coreboot.org/3410
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Stefan Reinauer <stefan.reinauer@coreboot.org>
This commit is contained in:
Siyuan Wang 2013-06-07 14:31:19 +08:00 committed by Stefan Reinauer
parent d2ae6ae789
commit 6c4f3ce490
2 changed files with 27 additions and 49 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

71
src/cpu/amd/agesa/s3_resume.c
View File

@ -147,6 +147,18 @@ void move_stack_high_mem(void)
:); :);
} }
#ifndef __PRE_RAM__
void write_mtrr(struct spi_flash *flash, u32 *p_nvram_pos, unsigned idx)
{
msr_t msr_data;
msr_data = rdmsr(idx);
flash->write(flash, *p_nvram_pos, 4, &msr_data.lo);
*p_nvram_pos += 4;
flash->write(flash, *p_nvram_pos, 4, &msr_data.hi);
*p_nvram_pos += 4;
}
#endif
void OemAgesaSaveMtrr(void) void OemAgesaSaveMtrr(void)
{ {
#ifndef __PRE_RAM__ #ifndef __PRE_RAM__
@ -174,32 +186,12 @@ void OemAgesaSaveMtrr(void)
wrmsr(SYS_CFG, msr_data); wrmsr(SYS_CFG, msr_data);
/* Fixed MTRRs */ /* Fixed MTRRs */
msr_data = rdmsr(0x250); write_mtrr(flash, &nvram_pos, 0x250);
write_mtrr(flash, &nvram_pos, 0x258);
write_mtrr(flash, &nvram_pos, 0x259);
flash->write(flash, nvram_pos, 4, &msr_data.lo); for (i = 0x268; i < 0x270; i++)
nvram_pos += 4; write_mtrr(flash, &nvram_pos, i);
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
msr_data = rdmsr(0x258);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
msr_data = rdmsr(0x259);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
for (i = 0x268; i < 0x270; i++) {
msr_data = rdmsr(i);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
}
/* Disable access to AMD RdDram and WrDram extension bits */ /* Disable access to AMD RdDram and WrDram extension bits */
msr_data = rdmsr(SYS_CFG); msr_data = rdmsr(SYS_CFG);
@ -207,34 +199,15 @@ void OemAgesaSaveMtrr(void)
wrmsr(SYS_CFG, msr_data); wrmsr(SYS_CFG, msr_data);
/* Variable MTRRs */ /* Variable MTRRs */
for (i = 0x200; i < 0x210; i++) { for (i = 0x200; i < 0x210; i++)
msr_data = rdmsr(i); write_mtrr(flash, &nvram_pos, i);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
}
/* SYS_CFG */ /* SYS_CFG */
msr_data = rdmsr(0xC0010010); write_mtrr(flash, &nvram_pos, 0xC0010010);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
/* TOM */ /* TOM */
msr_data = rdmsr(0xC001001A); write_mtrr(flash, &nvram_pos, 0xC001001A);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
/* TOM2 */ /* TOM2 */
msr_data = rdmsr(0xC001001D); write_mtrr(flash, &nvram_pos, 0xC001001D);
flash->write(flash, nvram_pos, 4, &msr_data.lo);
nvram_pos += 4;
flash->write(flash, nvram_pos, 4, &msr_data.hi);
nvram_pos += 4;
flash->spi->rw = SPI_WRITE_FLAG; flash->spi->rw = SPI_WRITE_FLAG;
spi_release_bus(flash->spi); spi_release_bus(flash->spi);

5
src/cpu/amd/agesa/s3_resume.h
View File

@ -49,6 +49,11 @@ u32 OemAgesaSaveS3Info (S3_DATA_TYPE S3DataType, u32 DataSize, void *Data);
void OemAgesaGetS3Info (S3_DATA_TYPE S3DataType, u32 *DataSize, void **Data); void OemAgesaGetS3Info (S3_DATA_TYPE S3DataType, u32 *DataSize, void **Data);
void OemAgesaSaveMtrr (void); void OemAgesaSaveMtrr (void);
#ifndef __PRE_RAM__
#include <spi_flash.h>
void write_mtrr(struct spi_flash *flash, u32 *p_nvram_pos, unsigned idx);
#endif
#endif #endif
#endif #endif