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

nehalem/raminit: Don't touch clock generator in raminit. 

Clock generator is mobo-specific. Don't touch it in raminit.

Change-Id: Ie114696b7fb13b8daee8dd1393d43bc609e149b3
Signed-off-by: Vladimir Serbinenko <phcoder@gmail.com>
Reviewed-on: http://review.coreboot.org/5265
Reviewed-by: Alexandru Gagniuc <mr.nuke.me@gmail.com>
Tested-by: build bot (Jenkins)
This commit is contained in:
Vladimir Serbinenko 2014-02-19 22:07:12 +01:00
parent 7d1996cc4a
commit 9817a37416
3 changed files with 29 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
src/mainboard/lenovo/x201/romstage.c
View File

@ -203,6 +203,17 @@ static inline u16 read_acpi16(u32 addr)
return inw(DEFAULT_PMBASE | addr); return inw(DEFAULT_PMBASE | addr);
} }
static void set_fsb_frequency(void)
{
u8 block[5];
u16 fsbfreq = 62879;
smbus_block_read(0x69, 0, 5, block);
block[0] = fsbfreq;
block[1] = fsbfreq >> 8;
smbus_block_write(0x69, 0, 5, block);
}
void main(unsigned long bist) void main(unsigned long bist)
{ {
u32 reg32; u32 reg32;
@ -287,6 +298,10 @@ void main(unsigned long bist)
timestamp_add_now(TS_BEFORE_INITRAM); timestamp_add_now(TS_BEFORE_INITRAM);
chipset_init(s3resume);
set_fsb_frequency();
raminit(s3resume, spd_addrmap); raminit(s3resume, spd_addrmap);
timestamp_add_now(TS_AFTER_INITRAM); timestamp_add_now(TS_AFTER_INITRAM);

37
src/northbridge/intel/nehalem/raminit.c
View File

@ -3796,28 +3796,11 @@ static void dmi_setup(void)
} }
#endif #endif
#if REAL void chipset_init(const int s3resume)
static void
set_fsb_frequency (void)
{ {
u8 block[5];
u16 fsbfreq = 62879;
smbus_block_read(0x69, 0, 5, block);
block[0] = fsbfreq;
block[1] = fsbfreq >> 8;
smbus_block_write(0x69, 0, 5, block);
}
#endif
void raminit(const int s3resume, const u8 *spd_addrmap)
{
unsigned channel, slot, lane, rank;
int i;
struct raminfo info;
u8 x2ca8; u8 x2ca8;
gav(x2ca8 = read_mchbar8(0x2ca8)); x2ca8 = read_mchbar8(0x2ca8);
if ((x2ca8 & 1) || (x2ca8 == 8 && !s3resume)) { if ((x2ca8 & 1) || (x2ca8 == 8 && !s3resume)) {
printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n"); printk(BIOS_DEBUG, "soft reset detected, rebooting properly\n");
write_mchbar8(0x2ca8, 0); write_mchbar8(0x2ca8, 0);
@ -3879,12 +3862,18 @@ void raminit(const int s3resume, const u8 *spd_addrmap)
pcie_write_config16(NORTHBRIDGE, D0F0_GGC, 0xb50); pcie_write_config16(NORTHBRIDGE, D0F0_GGC, 0xb50);
gav(read32(DEFAULT_RCBA | 0x3428)); gav(read32(DEFAULT_RCBA | 0x3428));
write32(DEFAULT_RCBA | 0x3428, 0x1d); write32(DEFAULT_RCBA | 0x3428, 0x1d);
}
#if !REAL void raminit(const int s3resume, const u8 *spd_addrmap)
pre_raminit_5(s3resume); {
#else unsigned channel, slot, lane, rank;
set_fsb_frequency(); int i;
#endif struct raminfo info;
u8 x2ca8;
u16 deven;
x2ca8 = read_mchbar8(0x2ca8);
deven = pcie_read_config16(NORTHBRIDGE, D0F0_DEVEN);
memset(&info, 0x5a, sizeof(info)); memset(&info, 0x5a, sizeof(info));

1
src/northbridge/intel/nehalem/raminit.h
View File

@ -22,6 +22,7 @@
#include "nehalem.h" #include "nehalem.h"
void chipset_init(const int s3resume);
/* spd_addrmap is array of 4 elements: /* spd_addrmap is array of 4 elements:
Channel 0 Slot 0 Channel 0 Slot 0
Channel 0 Slot 1 Channel 0 Slot 1