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

nb/intel/pineview: Replace remaining BAR accessors 

These changes are not reproducible for some reason.

Change-Id: If1fcd0285c3a14686f7deb70d83a4c63d57d62fe
Signed-off-by: Angel Pons <th3fanbus@gmail.com>
Reviewed-on: https://review.coreboot.org/c/coreboot/+/51871
Reviewed-by: Nico Huber <nico.h@gmx.de>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Angel Pons 2021-03-26 22:41:54 +01:00 committed by Nico Huber
parent 0aeaee7d9d
commit 11cabea60d
1 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -818,9 +818,9 @@ static void sdram_timings(struct sysinfo *s)
/* Program RCVEN delay with DLL-safe settings */ /* Program RCVEN delay with DLL-safe settings */
for (i = 0; i < 8; i++) { for (i = 0; i < 8; i++) {
mchbar_clrbits8(C0RXRCVyDLL(i), 0x3f); mchbar_clrbits8(C0RXRCVyDLL(i), 0x3f);
MCHBAR16_AND(C0RCVMISCCTL2, (u16) ~(3 << (i * 2))); mchbar_clrbits16(C0RCVMISCCTL2, 3 << (i * 2));
MCHBAR16_AND(C0RCVMISCCTL1, (u16) ~(3 << (i * 2))); mchbar_clrbits16(C0RCVMISCCTL1, 3 << (i * 2));
MCHBAR16_AND(C0COARSEDLY0, (u16) ~(3 << (i * 2))); mchbar_clrbits16(C0COARSEDLY0, 3 << (i * 2));
} }
mchbar_clrbits8(C0DLLPIEN, 1 << 0); /* Power up receiver */ mchbar_clrbits8(C0DLLPIEN, 1 << 0); /* Power up receiver */
mchbar_setbits8(C0DLLPIEN, 1 << 1); /* Enable RCVEN DLL */ mchbar_setbits8(C0DLLPIEN, 1 << 1); /* Enable RCVEN DLL */
@ -1865,12 +1865,12 @@ static void rcvenclock(u8 *coarse, u8 *medium, u8 lane)
{ {
if (*medium < 3) { if (*medium < 3) {
(*medium)++; (*medium)++;
MCHBAR16_AND_OR(C0RCVMISCCTL2, (u16)~(3 << (lane * 2)), *medium << (lane * 2)); mchbar_clrsetbits16(C0RCVMISCCTL2, 3 << (lane * 2), *medium << (lane * 2));
} else { } else {
*medium = 0; *medium = 0;
(*coarse)++; (*coarse)++;
mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, *coarse << 16); mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, *coarse << 16);
MCHBAR16_AND_OR(C0RCVMISCCTL2, (u16)(~3 << (lane * 2)), *medium << (lane * 2)); mchbar_clrsetbits16(C0RCVMISCCTL2, 3 << (lane * 2), *medium << (lane * 2));
} }
} }
@ -1903,7 +1903,7 @@ static void sdram_rcven(struct sysinfo *s)
medium = 0; medium = 0;
mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, coarse << 16); mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, coarse << 16);
MCHBAR16_AND_OR(C0RCVMISCCTL2, (u16)~(3 << (lane * 2)), medium << (lane * 2)); mchbar_clrsetbits16(C0RCVMISCCTL2, 3 << (lane * 2), medium << (lane * 2));
mchbar_clrbits8(C0RXRCVyDLL(lane), 0x3f); mchbar_clrbits8(C0RXRCVyDLL(lane), 0x3f);
@ -1914,7 +1914,7 @@ static void sdram_rcven(struct sysinfo *s)
PRINTK_DEBUG("rcven 0.1\n"); PRINTK_DEBUG("rcven 0.1\n");
// XXX comment out // XXX comment out
// MCHBAR16_AND_OR(C0RCVMISCCTL1, (u16)~3 << (lane * 2), 1 << (lane * 2)); // mchbar_clrsetbits16(C0RCVMISCCTL1, 3 << (lane * 2), 1 << (lane * 2));
while (sampledqs(dqshighaddr, strobeaddr, 0, 3) == 0) { while (sampledqs(dqshighaddr, strobeaddr, 0, 3) == 0) {
// printk(BIOS_DEBUG, "coarse=%d medium=%d\n", coarse, medium); // printk(BIOS_DEBUG, "coarse=%d medium=%d\n", coarse, medium);
@ -1946,7 +1946,7 @@ static void sdram_rcven(struct sysinfo *s)
coarse = savecoarse; coarse = savecoarse;
medium = savemedium; medium = savemedium;
mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, coarse << 16); mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, coarse << 16);
MCHBAR16_AND_OR(C0RCVMISCCTL2, (u16)~(0x3 << lane * 2), medium << (lane * 2)); mchbar_clrsetbits16(C0RCVMISCCTL2, 3 << (lane * 2), medium << (lane * 2));
while (sampledqs(dqshighaddr, strobeaddr, 1, 3) == 0) { while (sampledqs(dqshighaddr, strobeaddr, 1, 3) == 0) {
savepi = pi; savepi = pi;
@ -1999,7 +1999,7 @@ static void sdram_rcven(struct sysinfo *s)
do { do {
lane--; lane--;
offset = lanecoarse[lane] - minlanecoarse; offset = lanecoarse[lane] - minlanecoarse;
MCHBAR16_AND_OR(C0COARSEDLY0, (u16)(~(3 << (lane * 2))), offset << (lane * 2)); mchbar_clrsetbits16(C0COARSEDLY0, 3 << (lane * 2), offset << (lane * 2));
} while (lane != 0); } while (lane != 0);
mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, minlanecoarse << 16); mchbar_clrsetbits32(C0STATRDCTRL, 0xf << 16, minlanecoarse << 16);
@ -2372,9 +2372,7 @@ static void sdram_powersettings(struct sysinfo *s)
reg32 = s->nodll ? 0x30000000 : 0; reg32 = s->nodll ? 0x30000000 : 0;
/* FIXME: Compacting this results in changes to the binary */ mchbar_clrsetbits32(C0COREBONUS, 0xf << 24, 1 << 29 | reg32);
mchbar_write32(C0COREBONUS,
(mchbar_read32(C0COREBONUS) & ~(0xf << 24)) | 1 << 29 | reg32);
mchbar_clrsetbits32(CLOCKGATINGI, 0xf << 20, 0xf << 20); mchbar_clrsetbits32(CLOCKGATINGI, 0xf << 20, 0xf << 20);
mchbar_clrsetbits32(CLOCKGATINGII - 1, 0x001ff000, 0xbf << 20); mchbar_clrsetbits32(CLOCKGATINGII - 1, 0x001ff000, 0xbf << 20);