Iru Cai has uploaded this change for review. ( https://review.coreboot.org/c/coreboot/+/30187
Change subject: rename two haswell cpuid functions ......................................................................
rename two haswell cpuid functions
from cpu/intel/haswell/haswell_init.c
Change-Id: I1871c73c1855a8f3a3313a92daa7f91db782c565 Signed-off-by: Iru Cai mytbk920423@gmail.com --- M src/northbridge/intel/haswell/mrc.asm 1 file changed, 17 insertions(+), 17 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/87/30187/1
diff --git a/src/northbridge/intel/haswell/mrc.asm b/src/northbridge/intel/haswell/mrc.asm index c9a109e..cc4361b 100644 --- a/src/northbridge/intel/haswell/mrc.asm +++ b/src/northbridge/intel/haswell/mrc.asm @@ -549,9 +549,9 @@ lea esp, [esp - 0x1c] mov dword [ebp - 0x20], edx mov word [ebp - 0x1a], cx -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov ebx, eax -call fcn_fffc9077 ; call 0xfffc9077 +call haswell_stepping dec eax sete dl cmp ebx, 0x306c0 @@ -674,7 +674,7 @@ and eax, 0xfc000000 mov eax, dword [eax + 0x48] mov dword [ebp - 0x6c], eax -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov dword [ebp - 0x70], eax mov eax, dword [0xf0000060] mov edx, dword [0xf0000060] @@ -1698,8 +1698,8 @@ push ebp mov ebp, esp lea esp, [esp - 8] -call fcn_fffc9077 ; call 0xfffc9077 -call fcn_fffc908a ; call 0xfffc908a +call haswell_stepping +call haswell_family_model mov edx, 4 mov eax, ref_fffcd4a4 ; mov eax, 0xfffcd4a4 call fcn_fffa11b3 ; call 0xfffa11b3 @@ -3932,7 +3932,7 @@ call mrc_printk ; call 0xfffa1253 mov edx, dword [0xff7d7538] mov dword [ebp - 0x640], edx -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov ecx, dword [ebp - 0x640] lea edx, [ebp - 0x628] mov dword [ebp - 0x648], eax @@ -3945,7 +3945,7 @@ call dword [eax + 0x20] ; ucall mov ebx, dword [ebp - 0x628] add esp, 0x20 -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov ecx, eax mov esi, dword [0xf0000060] and esi, 0xfc000000 @@ -4057,9 +4057,9 @@
loc_fffa3fd4: mov ebx, dword [ebp - 0x628] -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov esi, eax -call fcn_fffc9077 ; call 0xfffc9077 +call haswell_stepping dec eax sete dl cmp esi, 0x306c0 @@ -4088,7 +4088,7 @@ je loc_fffa4d64 ; je 0xfffa4d64 mov eax, dword [ebp - 0x628] mov dword [ebp - 0x660], eax -call fcn_fffc9077 ; call 0xfffc9077 +call haswell_stepping mov eax, dword [0xf0000060] sub esp, 0xc and eax, 0xfc000000 @@ -4117,9 +4117,9 @@ and eax, 0xfffffffe and ebx, 0xfffffffe mov dword [ebp - 0x648], eax -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov edi, eax -call fcn_fffc9077 ; call 0xfffc9077 +call haswell_stepping mov edx, 0xa00
loc_fffa40d3: @@ -4896,7 +4896,7 @@ mov edx, dword [eax + 0x6c] mov eax, dword [eax + 0x68] mov edi, eax -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov edx, dword [ebp - 0x640] sub esp, 0xc mov ebx, eax @@ -42664,9 +42664,9 @@ cmove ebx, eax
loc_fffc1e18: -call fcn_fffc908a ; call 0xfffc908a +call haswell_family_model mov esi, eax -call fcn_fffc9077 ; call 0xfffc9077 +call haswell_stepping cmp esi, 0x40650 jne short loc_fffc1e38 ; jne 0xfffc1e38 mov dword [ebp - 0x4035], 0x40650 @@ -52260,7 +52260,7 @@ pop ebp ret
-fcn_fffc9077: +haswell_stepping: push ebp xor ecx, ecx mov eax, 1 @@ -52272,7 +52272,7 @@ pop ebp ret
-fcn_fffc908a: +haswell_family_model: push ebp xor ecx, ecx mov eax, 1