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

nb/intel/x4x: Fix programming CxDRB 

Programming CxDRB should be cumulative as explained in "Intel ® 4
Series Chipset Family datasheet".

This does not seem to have any real impact but better do according to
the documentation and what vendor firmware does.

This also removes some dead code.

Change-Id: I7ff3264824c843f84b9eb6c06a06aa3f151fe4b3
Signed-off-by: Arthur Heymans <arthur@aheymans.xyz>
Reviewed-on: https://review.coreboot.org/22911
Reviewed-by: Felix Held <felix-coreboot@felixheld.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Arthur Heymans 2017-12-16 19:48:00 +01:00 committed by Felix Held
parent 95c48cbbb5
commit dfce932cf0
1 changed files with 9 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
src/northbridge/intel/x4x/raminit_ddr2.c
View File

@ -48,24 +48,6 @@ u32 ddr2mhz(u32 speed)
return mhz[speed]; return mhz[speed];
} }
/* Find MSB bitfield location using bit scan reverse instruction */
static u8 msbpos(u32 val)
{
u32 pos;
if (val == 0) {
printk(BIOS_WARNING, "WARNING: Input to BSR is zero\n");
return 0;
}
asm ("bsrl %1, %0"
: "=r"(pos)
: "r"(val)
);
return (u8)(pos & 0xff);
}
static void clkcross_ddr2(struct sysinfo *s) static void clkcross_ddr2(struct sysinfo *s)
{ {
u8 i, j; u8 i, j;
@ -1240,19 +1222,18 @@ static void dradrb_ddr2(struct sysinfo *s)
MCHBAR8(0x660) = MCHBAR8(0x660) | 1; MCHBAR8(0x660) = MCHBAR8(0x660) | 1;
// DRB // DRB
FOR_EACH_POPULATED_RANK(s->dimms, ch, r) { FOR_EACH_RANK(ch, r) {
if (s->dimms[ch<<1].card_type != RAW_CARD_UNPOPULATED
&& (r) < s->dimms[ch<<1].ranks)
i = ch << 1;
else
i = (ch << 1) + 1;
if (ch == 0) { if (ch == 0) {
dra0 = (c0dra >> (8*r)) & 0x7f; if (RANK_IS_POPULATED(s->dimms, ch, r)) {
c0drb = (u16)(c0drb + drbtab[dra0]); dra0 = (c0dra >> (8*r)) & 0x7f;
c0drb = (u16)(c0drb + drbtab[dra0]);
}
MCHBAR16(0x200 + 2*r) = c0drb; MCHBAR16(0x200 + 2*r) = c0drb;
} else { } else {
dra1 = (c1dra >> (8*r)) & 0x7f; if (RANK_IS_POPULATED(s->dimms, ch, r)) {
c1drb = (u16)(c1drb + drbtab[dra1]); dra1 = (c1dra >> (8*r)) & 0x7f;
c1drb = (u16)(c1drb + drbtab[dra1]);
}
MCHBAR16(0x600 + 2*r) = c1drb; MCHBAR16(0x600 + 2*r) = c1drb;
} }
} }
@ -1263,14 +1244,6 @@ static void dradrb_ddr2(struct sysinfo *s)
printk(BIOS_DEBUG, "Total memory: %d + %d = %dMiB\n", printk(BIOS_DEBUG, "Total memory: %d + %d = %dMiB\n",
s->channel_capacity[0], s->channel_capacity[1], totalmemorymb); s->channel_capacity[0], s->channel_capacity[1], totalmemorymb);
rankpop1 >>= 4;
if (rankpop1) {
MCHBAR16(0x600 + 2*msbpos(rankpop1)) = c0drb + c1drb;
MCHBAR16(0x602 + 2*msbpos(rankpop1)) = c0drb + c1drb;
MCHBAR16(0x604 + 2*msbpos(rankpop1)) = c0drb + c1drb;
MCHBAR16(0x606 + 2*msbpos(rankpop1)) = c0drb + c1drb;
}
/* Populated channel sizes in MiB */ /* Populated channel sizes in MiB */
size0 = s->channel_capacity[0]; size0 = s->channel_capacity[0];
size1 = s->channel_capacity[1]; size1 = s->channel_capacity[1];