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

sandybridge/raminit_common: use MCHBAR AND/OR/AND_OR macros [2/2] 

This patch contains the parts that changed the hash of the generated binary;
probably due to the compiler optimizing things slightly different.

Change-Id: Ide0b3296864e24edb646956e47221bfef8182e3d
Signed-off-by: Felix Held <felix-coreboot@felixheld.de>
Reviewed-on: https://review.coreboot.org/27725
Reviewed-by: Patrick Rudolph <siro@das-labor.org>
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
This commit is contained in:
Felix Held 2018-07-29 21:46:19 +02:00
parent 2463aa9117
commit b802c0772e
1 changed files with 8 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
src/northbridge/intel/sandybridge/raminit_common.c
View File

@ -1944,7 +1944,6 @@ int write_training(ramctr_timing * ctrl)
{ {
int channel, slotrank, lane; int channel, slotrank, lane;
int err; int err;
volatile u32 tmp;
FOR_ALL_POPULATED_CHANNELS FOR_ALL_POPULATED_CHANNELS
MCHBAR32_OR(0x4008 + 0x400 * channel, 0x8000000); MCHBAR32_OR(0x4008 + 0x400 * channel, 0x8000000);
@ -1993,6 +1992,7 @@ int write_training(ramctr_timing * ctrl)
MCHBAR32_OR(0x5030, 8); MCHBAR32_OR(0x5030, 8);
FOR_ALL_POPULATED_CHANNELS { FOR_ALL_POPULATED_CHANNELS {
volatile u32 tmp;
MCHBAR32_AND(0x4020 + 0x400 * channel, ~0x00200000); MCHBAR32_AND(0x4020 + 0x400 * channel, ~0x00200000);
tmp = MCHBAR32(0x428c + 0x400 * channel); tmp = MCHBAR32(0x428c + 0x400 * channel);
wait_428c(channel); wait_428c(channel);
@ -2014,8 +2014,7 @@ int write_training(ramctr_timing * ctrl)
printram("CPF\n"); printram("CPF\n");
FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS FOR_ALL_LANES { FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS FOR_ALL_LANES {
tmp = MCHBAR32(0x4080 + 0x400 * channel + 4 * lane); MCHBAR32_AND(0x4080 + 0x400 * channel + 4 * lane, 0);
MCHBAR32(0x4080 + 0x400 * channel + 4 * lane) = 0;
} }
FOR_ALL_POPULATED_CHANNELS { FOR_ALL_POPULATED_CHANNELS {
@ -2039,8 +2038,7 @@ int write_training(ramctr_timing * ctrl)
program_timings(ctrl, channel); program_timings(ctrl, channel);
FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS FOR_ALL_LANES { FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS FOR_ALL_LANES {
tmp = MCHBAR32(0x4080 + 0x400 * channel + 4 * lane); MCHBAR32_AND(0x4080 + 0x400 * channel + 4 * lane, 0);
MCHBAR32(0x4080 + 0x400 * channel + 4 * lane) = 0;
} }
return 0; return 0;
} }
@ -2591,7 +2589,6 @@ static int discover_edges_write_real(ramctr_timing *ctrl, int channel,
int lower[NUM_LANES]; int lower[NUM_LANES];
int upper[NUM_LANES]; int upper[NUM_LANES];
int pat; int pat;
volatile u32 tmp;
FOR_ALL_LANES { FOR_ALL_LANES {
lower[lane] = 0; lower[lane] = 0;
@ -2616,6 +2613,7 @@ static int discover_edges_write_real(ramctr_timing *ctrl, int channel,
program_timings(ctrl, channel); program_timings(ctrl, channel);
FOR_ALL_LANES { FOR_ALL_LANES {
volatile u32 tmp;
MCHBAR32(0x4340 + 0x400 * channel + MCHBAR32(0x4340 + 0x400 * channel +
4 * lane) = 0; 4 * lane) = 0;
tmp = MCHBAR32(0x400 * channel + tmp = MCHBAR32(0x400 * channel +
@ -2660,6 +2658,7 @@ static int discover_edges_write_real(ramctr_timing *ctrl, int channel,
MCHBAR32(0x4284 + 0x400 * channel) = 0xc0001; MCHBAR32(0x4284 + 0x400 * channel) = 0xc0001;
wait_428c(channel); wait_428c(channel);
FOR_ALL_LANES { FOR_ALL_LANES {
volatile u32 tmp;
tmp = MCHBAR32(0x4340 + tmp = MCHBAR32(0x4340 +
0x400 * channel + lane * 4); 0x400 * channel + lane * 4);
} }
@ -3153,10 +3152,10 @@ void final_registers(ramctr_timing * ctrl)
} }
printk(BIOS_DEBUG, "t123: %d, %d, %d\n", printk(BIOS_DEBUG, "t123: %d, %d, %d\n",
t1_ns, t2_ns, t3_ns); t1_ns, t2_ns, t3_ns);
MCHBAR32(0x5d10) = ((encode_5d10(t1_ns) + encode_5d10(t2_ns)) << 16) | MCHBAR32_AND_OR(0x5d10, 0xC0C0C0C0,
((encode_5d10(t1_ns) + encode_5d10(t2_ns)) << 16) |
(encode_5d10(t1_ns) << 8) | ((encode_5d10(t3_ns) + (encode_5d10(t1_ns) << 8) | ((encode_5d10(t3_ns) +
encode_5d10(t2_ns) + encode_5d10(t1_ns)) << 24) | encode_5d10(t2_ns) + encode_5d10(t1_ns)) << 24) | 0xc);
(MCHBAR32(0x5d10) & 0xC0C0C0C0) | 0xc;
} }
void restore_timings(ramctr_timing * ctrl) void restore_timings(ramctr_timing * ctrl)