<p>Felix Held has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/27725">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">sandybridge/raminit_common: use MCHBAR AND/OR/AND_OR macros [2/2]<br><br>This patch contains the parts that changed the hash of the generated binary;<br>probably due to the compiler optimizing things slightly different.<br><br>Change-Id: Ide0b3296864e24edb646956e47221bfef8182e3d<br>Signed-off-by: Felix Held <felix-coreboot@felixheld.de><br>---<br>M src/northbridge/intel/sandybridge/raminit_common.c<br>1 file changed, 8 insertions(+), 9 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/25/27725/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/intel/sandybridge/raminit_common.c b/src/northbridge/intel/sandybridge/raminit_common.c</span><br><span>index b21b5ac..6639fd9 100644</span><br><span>--- a/src/northbridge/intel/sandybridge/raminit_common.c</span><br><span>+++ b/src/northbridge/intel/sandybridge/raminit_common.c</span><br><span>@@ -1944,7 +1944,6 @@</span><br><span> {</span><br><span> int channel, slotrank, lane;</span><br><span> int err;</span><br><span style="color: hsl(0, 100%, 40%);">- volatile u32 tmp;</span><br><span> </span><br><span> FOR_ALL_POPULATED_CHANNELS</span><br><span> MCHBAR32_OR(0x4008 + 0x400 * channel, 0x8000000);</span><br><span>@@ -1993,6 +1992,7 @@</span><br><span> MCHBAR32_OR(0x5030, 8);</span><br><span> </span><br><span> FOR_ALL_POPULATED_CHANNELS {</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile u32 tmp;</span><br><span> MCHBAR32_AND(0x4020 + 0x400 * channel, ~0x00200000);</span><br><span> tmp = MCHBAR32(0x428c + 0x400 * channel);</span><br><span> wait_428c(channel);</span><br><span>@@ -2014,8 +2014,7 @@</span><br><span> printram("CPF\n");</span><br><span> </span><br><span> FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS FOR_ALL_LANES {</span><br><span style="color: hsl(0, 100%, 40%);">- tmp = MCHBAR32(0x4080 + 0x400 * channel + 4 * lane);</span><br><span style="color: hsl(0, 100%, 40%);">- MCHBAR32(0x4080 + 0x400 * channel + 4 * lane) = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ MCHBAR32_AND(0x4080 + 0x400 * channel + 4 * lane, 0);</span><br><span> }</span><br><span> </span><br><span> FOR_ALL_POPULATED_CHANNELS {</span><br><span>@@ -2039,8 +2038,7 @@</span><br><span> program_timings(ctrl, channel);</span><br><span> </span><br><span> FOR_ALL_CHANNELS FOR_ALL_POPULATED_RANKS FOR_ALL_LANES {</span><br><span style="color: hsl(0, 100%, 40%);">- tmp = MCHBAR32(0x4080 + 0x400 * channel + 4 * lane);</span><br><span style="color: hsl(0, 100%, 40%);">- MCHBAR32(0x4080 + 0x400 * channel + 4 * lane) = 0;</span><br><span style="color: hsl(120, 100%, 40%);">+ MCHBAR32_AND(0x4080 + 0x400 * channel + 4 * lane, 0);</span><br><span> }</span><br><span> return 0;</span><br><span> }</span><br><span>@@ -2591,7 +2589,6 @@</span><br><span> int lower[NUM_LANES];</span><br><span> int upper[NUM_LANES];</span><br><span> int pat;</span><br><span style="color: hsl(0, 100%, 40%);">- volatile u32 tmp;</span><br><span> </span><br><span> FOR_ALL_LANES {</span><br><span> lower[lane] = 0;</span><br><span>@@ -2616,6 +2613,7 @@</span><br><span> program_timings(ctrl, channel);</span><br><span> </span><br><span> FOR_ALL_LANES {</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile u32 tmp;</span><br><span> MCHBAR32(0x4340 + 0x400 * channel +</span><br><span> 4 * lane) = 0;</span><br><span> tmp = MCHBAR32(0x400 * channel +</span><br><span>@@ -2660,6 +2658,7 @@</span><br><span> MCHBAR32(0x4284 + 0x400 * channel) = 0xc0001;</span><br><span> wait_428c(channel);</span><br><span> FOR_ALL_LANES {</span><br><span style="color: hsl(120, 100%, 40%);">+ volatile u32 tmp;</span><br><span> tmp = MCHBAR32(0x4340 +</span><br><span> 0x400 * channel + lane * 4);</span><br><span> }</span><br><span>@@ -3153,10 +3152,10 @@</span><br><span> }</span><br><span> printk(BIOS_DEBUG, "t123: %d, %d, %d\n",</span><br><span> t1_ns, t2_ns, t3_ns);</span><br><span style="color: hsl(0, 100%, 40%);">- MCHBAR32(0x5d10) = ((encode_5d10(t1_ns) + encode_5d10(t2_ns)) << 16) |</span><br><span style="color: hsl(120, 100%, 40%);">+ MCHBAR32_AND_OR(0x5d10, 0xC0C0C0C0,</span><br><span style="color: hsl(120, 100%, 40%);">+ ((encode_5d10(t1_ns) + encode_5d10(t2_ns)) << 16) |</span><br><span> (encode_5d10(t1_ns) << 8) | ((encode_5d10(t3_ns) +</span><br><span style="color: hsl(0, 100%, 40%);">- encode_5d10(t2_ns) + encode_5d10(t1_ns)) << 24) |</span><br><span style="color: hsl(0, 100%, 40%);">- (MCHBAR32(0x5d10) & 0xC0C0C0C0) | 0xc;</span><br><span style="color: hsl(120, 100%, 40%);">+ encode_5d10(t2_ns) + encode_5d10(t1_ns)) << 24) | 0xc);</span><br><span> }</span><br><span> </span><br><span> void restore_timings(ramctr_timing * ctrl)</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/27725">change 27725</a>. To unsubscribe, or for help writing mail filters, visit <a href="https://review.coreboot.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://review.coreboot.org/27725"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: coreboot </div>
<div style="display:none"> Gerrit-Branch: master </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>
<div style="display:none"> Gerrit-Change-Id: Ide0b3296864e24edb646956e47221bfef8182e3d </div>
<div style="display:none"> Gerrit-Change-Number: 27725 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Felix Held <felix-coreboot@felixheld.de> </div>