sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

nb/pineview/raminit: Fix raminit failing on hot reset path

Browse Source 
For raminit to succeed on a hot reset the following things are
prevented from running:
* Clearing self refresh
* Setting memory frequency
* programming sdram dll timings
* programming rcomp

TESTED on Intel d510mo.

Change-Id: I8f7e5c2958df29a96cdf856ade2f4f33707ad362
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/19337
Tested-by: build bot (Jenkins)
Reviewed-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
This commit is contained in:
Arthur Heymans
2017-04-17 17:50:40 +02:00
committed by Martin Roth
parent 5e1194567f
commit 00fd3ff507
2 changed files with 22 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
src/mainboard/intel/d510mo/romstage.c
View File

@ -121,7 +121,10 @@ void mainboard_romstage_entry(unsigned long bist)
post_code(0x30); post_code(0x30);
printk(BIOS_DEBUG, "Initializing memory\n"); printk(BIOS_DEBUG, "Initializing memory\n");
sdram_initialize(0, spd_addrmap); if (MCHBAR32(0xf14) & (1 << 8)) /* HOT RESET */
sdram_initialize(BOOT_PATH_RESET, spd_addrmap);
else
sdram_initialize(BOOT_PATH_NORMAL, spd_addrmap);
printk(BIOS_DEBUG, "Memory initialized\n"); printk(BIOS_DEBUG, "Memory initialized\n");
post_code(0x31); post_code(0x31);

24
src/northbridge/intel/pineview/raminit.c
View File

@ -569,6 +569,8 @@ static void sdram_detect_ram_speed(struct sysinfo *s)
PRINTK_DEBUG("Drive Memory at %dMHz with CAS = %d clocks\n", ddr_reg_to_mhz(s->selected_timings.mem_clock), s->selected_timings.CAS); PRINTK_DEBUG("Drive Memory at %dMHz with CAS = %d clocks\n", ddr_reg_to_mhz(s->selected_timings.mem_clock), s->selected_timings.CAS);
// Set memory frequency // Set memory frequency
if (s->boot_path == BOOT_PATH_RESET)
return;
MCHBAR32(0xf14) = MCHBAR32(0xf14) | 0x1; MCHBAR32(0xf14) = MCHBAR32(0xf14) | 0x1;
reg32 = (MCHBAR32(0xc00) & (~0x70)) | (1 << 10); reg32 = (MCHBAR32(0xc00) & (~0x70)) | (1 << 10);
if (s->selected_timings.mem_clock == MEM_CLOCK_800MHz) { if (s->selected_timings.mem_clock == MEM_CLOCK_800MHz) {
@ -676,7 +678,8 @@ static void sdram_clkmode(struct sysinfo *s)
reg8 = 1; reg8 = 1;
reg16 = (1 << 8) | (1 << 5); reg16 = (1 << 8) | (1 << 5);
} }
MCHBAR16(0x1c0) = (MCHBAR16(0x1c0) & ~(0x033f)) | reg16; if (s->boot_path != BOOT_PATH_RESET)
MCHBAR16(0x1c0) = (MCHBAR16(0x1c0) & ~(0x033f)) | reg16;
MCHBAR32(0x220) = 0x58001117; MCHBAR32(0x220) = 0x58001117;
MCHBAR32(0x248) = (MCHBAR32(0x248) | (1 << 23)); MCHBAR32(0x248) = (MCHBAR32(0x248) | (1 << 23));
@ -2540,12 +2543,14 @@ void sdram_initialize(int boot_path, const u8 *spd_addresses)
{ {
struct sysinfo si; struct sysinfo si;
u8 reg8; u8 reg8;
const char *boot_str[] = { "Normal", "Reset", "Resume"};
PRINTK_DEBUG("Setting up RAM controller.\n"); PRINTK_DEBUG("Setting up RAM controller.\n");
memset(&si, 0, sizeof(si)); memset(&si, 0, sizeof(si));
si.boot_path = boot_path; si.boot_path = boot_path;
printk(BIOS_DEBUG, "Boot path: %s\n", boot_str[boot_path]);
si.spd_map[0] = spd_addresses[0]; si.spd_map[0] = spd_addresses[0];
si.spd_map[1] = spd_addresses[1]; si.spd_map[1] = spd_addresses[1];
si.spd_map[2] = spd_addresses[2]; si.spd_map[2] = spd_addresses[2];
@ -2578,18 +2583,25 @@ void sdram_initialize(int boot_path, const u8 *spd_addresses)
sdram_timings(&si); sdram_timings(&si);
PRINTK_DEBUG("Done timings (dqs dll enabled)\n"); PRINTK_DEBUG("Done timings (dqs dll enabled)\n");
sdram_dlltiming(&si); if (si.boot_path != BOOT_PATH_RESET) {
PRINTK_DEBUG("Done dlltiming\n"); sdram_dlltiming(&si);
PRINTK_DEBUG("Done dlltiming\n");
}
hpet_udelay(200000); hpet_udelay(200000);
sdram_rcomp(&si); if (si.boot_path != BOOT_PATH_RESET) {
PRINTK_DEBUG("Done RCOMP\n"); sdram_rcomp(&si);
PRINTK_DEBUG("Done RCOMP\n");
}
sdram_odt(&si); sdram_odt(&si);
PRINTK_DEBUG("Done odt\n"); PRINTK_DEBUG("Done odt\n");
while ((MCHBAR8(0x130) & 0x1) != 0); if (si.boot_path != BOOT_PATH_RESET) {
while ((MCHBAR8(0x130) & 0x1) != 0)
;
}
sdram_mmap(&si); sdram_mmap(&si);
PRINTK_DEBUG("Done mmap\n"); PRINTK_DEBUG("Done mmap\n");