<p>Iru Cai has uploaded this change for <strong>review</strong>.</p><p><a href="https://review.coreboot.org/c/coreboot/+/30187">View Change</a></p><pre style="font-family: monospace,monospace; white-space: pre-wrap;">rename two haswell cpuid functions<br><br>from cpu/intel/haswell/haswell_init.c<br><br>Change-Id: I1871c73c1855a8f3a3313a92daa7f91db782c565<br>Signed-off-by: Iru Cai <mytbk920423@gmail.com><br>---<br>M src/northbridge/intel/haswell/mrc.asm<br>1 file changed, 17 insertions(+), 17 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/30187/1</pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/src/northbridge/intel/haswell/mrc.asm b/src/northbridge/intel/haswell/mrc.asm</span><br><span>index c9a109e..cc4361b 100644</span><br><span>--- a/src/northbridge/intel/haswell/mrc.asm</span><br><span>+++ b/src/northbridge/intel/haswell/mrc.asm</span><br><span>@@ -549,9 +549,9 @@</span><br><span> lea esp, [esp - 0x1c]</span><br><span> mov dword [ebp - 0x20], edx</span><br><span> mov word [ebp - 0x1a], cx</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov ebx, eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc9077  ; call 0xfffc9077</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_stepping</span><br><span> dec eax</span><br><span> sete dl</span><br><span> cmp ebx, 0x306c0</span><br><span>@@ -674,7 +674,7 @@</span><br><span> and eax, 0xfc000000</span><br><span> mov eax, dword [eax + 0x48]</span><br><span> mov dword [ebp - 0x6c], eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov dword [ebp - 0x70], eax</span><br><span> mov eax, dword [0xf0000060]</span><br><span> mov edx, dword [0xf0000060]</span><br><span>@@ -1698,8 +1698,8 @@</span><br><span> push ebp</span><br><span> mov ebp, esp</span><br><span> lea esp, [esp - 8]</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc9077  ; call 0xfffc9077</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_stepping</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov edx, 4</span><br><span> mov eax, ref_fffcd4a4  ; mov eax, 0xfffcd4a4</span><br><span> call fcn_fffa11b3  ; call 0xfffa11b3</span><br><span>@@ -3932,7 +3932,7 @@</span><br><span> call mrc_printk  ; call 0xfffa1253</span><br><span> mov edx, dword [0xff7d7538]</span><br><span> mov dword [ebp - 0x640], edx</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov ecx, dword [ebp - 0x640]</span><br><span> lea edx, [ebp - 0x628]</span><br><span> mov dword [ebp - 0x648], eax</span><br><span>@@ -3945,7 +3945,7 @@</span><br><span> call dword [eax + 0x20]  ; ucall</span><br><span> mov ebx, dword [ebp - 0x628]</span><br><span> add esp, 0x20</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov ecx, eax</span><br><span> mov esi, dword [0xf0000060]</span><br><span> and esi, 0xfc000000</span><br><span>@@ -4057,9 +4057,9 @@</span><br><span> </span><br><span> loc_fffa3fd4:</span><br><span> mov ebx, dword [ebp - 0x628]</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov esi, eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc9077  ; call 0xfffc9077</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_stepping</span><br><span> dec eax</span><br><span> sete dl</span><br><span> cmp esi, 0x306c0</span><br><span>@@ -4088,7 +4088,7 @@</span><br><span> je loc_fffa4d64  ; je 0xfffa4d64</span><br><span> mov eax, dword [ebp - 0x628]</span><br><span> mov dword [ebp - 0x660], eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc9077  ; call 0xfffc9077</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_stepping</span><br><span> mov eax, dword [0xf0000060]</span><br><span> sub esp, 0xc</span><br><span> and eax, 0xfc000000</span><br><span>@@ -4117,9 +4117,9 @@</span><br><span> and eax, 0xfffffffe</span><br><span> and ebx, 0xfffffffe</span><br><span> mov dword [ebp - 0x648], eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov edi, eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc9077  ; call 0xfffc9077</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_stepping</span><br><span> mov edx, 0xa00</span><br><span> </span><br><span> loc_fffa40d3:</span><br><span>@@ -4896,7 +4896,7 @@</span><br><span> mov edx, dword [eax + 0x6c]</span><br><span> mov eax, dword [eax + 0x68]</span><br><span> mov edi, eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov edx, dword [ebp - 0x640]</span><br><span> sub esp, 0xc</span><br><span> mov ebx, eax</span><br><span>@@ -42664,9 +42664,9 @@</span><br><span> cmove ebx, eax</span><br><span> </span><br><span> loc_fffc1e18:</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc908a  ; call 0xfffc908a</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_family_model</span><br><span> mov esi, eax</span><br><span style="color: hsl(0, 100%, 40%);">-call fcn_fffc9077  ; call 0xfffc9077</span><br><span style="color: hsl(120, 100%, 40%);">+call haswell_stepping</span><br><span> cmp esi, 0x40650</span><br><span> jne short loc_fffc1e38  ; jne 0xfffc1e38</span><br><span> mov dword [ebp - 0x4035], 0x40650</span><br><span>@@ -52260,7 +52260,7 @@</span><br><span> pop ebp</span><br><span> ret</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-fcn_fffc9077:</span><br><span style="color: hsl(120, 100%, 40%);">+haswell_stepping:</span><br><span> push ebp</span><br><span> xor ecx, ecx</span><br><span> mov eax, 1</span><br><span>@@ -52272,7 +52272,7 @@</span><br><span> pop ebp</span><br><span> ret</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-fcn_fffc908a:</span><br><span style="color: hsl(120, 100%, 40%);">+haswell_family_model:</span><br><span> push ebp</span><br><span> xor ecx, ecx</span><br><span> mov eax, 1</span><br><span></span><br></pre><p>To view, visit <a href="https://review.coreboot.org/c/coreboot/+/30187">change 30187</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/c/coreboot/+/30187"/><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-Change-Id: I1871c73c1855a8f3a3313a92daa7f91db782c565 </div>
<div style="display:none"> Gerrit-Change-Number: 30187 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Iru Cai <mytbk920423@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Iru Cai <mytbk920423@gmail.com> </div>
<div style="display:none"> Gerrit-Reviewer: Patrick Rudolph <siro@das-labor.org> </div>
<div style="display:none"> Gerrit-MessageType: newchange </div>