Skip to content

Commit 0191220

Browse files
ElyesHPatrick Georgi
authored andcommitted
nb/intel/i945: Check if interleaved even if rank #4 size is zero
Tested config: Interleaved (config; status before, after): DIMM{0 + 2}: ok, ok DIMM{0 + 3}: Nok, ok DIMM{1 + 2}: ok, ok DIMM{1 + 3}: Nok, ok DIMM{1 + 2 + 3}: ok, ok DIMM{0 + 2 + 3}: ok, ok DIMM{0 + 1 + 2}: ok, ok DIMM{0 + 1 + 3}: Nok, ok Not Interleaved: DIMM{0 + 1 + 3}: Nok, Nok DIMM{0 + 1 + 2}: ok, ok (with single ranked) DIMM{0 + 1 + 2}: Nok, Nok (with only dual ranked) DIMM{0 + 2 + 3}: Nok, ok DIMM{1 + 2 + 3}: ok, ok Change-Id: Ibf130a3d4b6f8fa816f7a5f06822a9b8807be3d4 Signed-off-by: Elyes HAOUAS <ehaouas@noos.fr> Reviewed-on: https://review.coreboot.org/c/coreboot/+/31007 Tested-by: build bot (Jenkins) <no-reply@coreboot.org> Reviewed-by: Nico Huber <nico.h@gmx.de>
1 parent d6d6771 commit 0191220

File tree

1 file changed

+5
-15
lines changed

1 file changed

+5
-15
lines changed

src/northbridge/intel/i945/raminit.c

Lines changed: 5 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -2546,29 +2546,19 @@ static void sdram_jedec_enable(struct sys_info *sysinfo)
25462546
u32 bankaddr = 0, tmpaddr, mrsaddr = 0;
25472547

25482548
for (i = 0, nonzero = -1; i < 8; i++) {
2549-
if (sysinfo->banksize[i] == 0)
2549+
if (sysinfo->banksize[i] == 0)
25502550
continue;
25512551

25522552
printk(BIOS_DEBUG, "jedec enable sequence: bank %d\n", i);
2553-
switch (i) {
2554-
case 0:
2555-
/* Start at address 0 */
2556-
bankaddr = 0;
2557-
break;
2558-
case 4:
2559-
if (sysinfo->interleaved) {
2553+
2554+
if (nonzero != -1) {
2555+
if (sysinfo->interleaved && nonzero < 4 && i >= 4) {
25602556
bankaddr = 0x40;
2561-
break;
2562-
}
2563-
default:
2564-
if (nonzero != -1) {
2557+
} else {
25652558
printk(BIOS_DEBUG, "bankaddr from bank size of rank %d\n", nonzero);
25662559
bankaddr += sysinfo->banksize[nonzero] <<
25672560
(sysinfo->interleaved ? 26 : 25);
2568-
break;
25692561
}
2570-
/* No populated bank hit before. Start at address 0 */
2571-
bankaddr = 0;
25722562
}
25732563

25742564
/* We have a bank with a non-zero size.. Remember it

0 commit comments

Comments
 (0)