sravan/system76-coreboot
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

AGESA binaryPI: Fix cache-as-ram for x86_64

Browse Source 
AMD_ENABLE_STACK was not called on x86_64 path for AGESA, while
it was for binaryPI.

Comments on BIST and cpu_init_detected were reversed, so fix those
too.

Change-Id: I0ddfaf51feb386a56d488c29d60171b05ff6fbc4
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/17551
Tested-by: build bot (Jenkins)
Reviewed-by: Paul Menzel <paulepanter@users.sourceforge.net>
Reviewed-by: Edward O'Callaghan <edward.ocallaghan@koparo.com>
This commit is contained in:
Kyösti Mälkki
2016-11-21 11:26:48 +02:00
parent 619a245def
commit f6fe2f1286
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
src/cpu/amd/agesa/cache_as_ram.inc
View File

@@ -61,6 +61,8 @@ cache_as_ram_setup:
post_code(0xa1) post_code(0xa1)
AMD_ENABLE_STACK
#ifdef __x86_64__ #ifdef __x86_64__
/* switch to 64 bit long mode */ /* switch to 64 bit long mode */
mov %esi, %ecx mov %esi, %ecx
@@ -103,10 +105,10 @@ cache_as_ram_setup:
# use call far to switch to 64-bit code segment # use call far to switch to 64-bit code segment
ljmp $0x18, $1f ljmp $0x18, $1f
1: 1:
/* Pass the BIST result */ /* Pass the cpu_init_detected */
cvtsd2si %xmm1, %esi cvtsd2si %xmm1, %esi
/* Pass the cpu_init_detected */ /* Pass the BIST result */
cvtsd2si %xmm0, %edi cvtsd2si %xmm0, %edi
/* align the stack */ /* align the stack */
@@ -117,7 +119,6 @@ cache_as_ram_setup:
.code32 .code32
#else #else
AMD_ENABLE_STACK
/* Restore the BIST result */ /* Restore the BIST result */
cvtsd2si %xmm0, %edx cvtsd2si %xmm0, %edx

6
src/cpu/amd/pi/cache_as_ram.inc
View File

@@ -62,6 +62,7 @@ cache_as_ram_setup:
post_code(0xa1) post_code(0xa1)
AMD_ENABLE_STACK AMD_ENABLE_STACK
#ifdef __x86_64__ #ifdef __x86_64__
/* switch to 64 bit long mode */ /* switch to 64 bit long mode */
mov %esi, %ecx mov %esi, %ecx
@@ -104,10 +105,10 @@ cache_as_ram_setup:
# use call far to switch to 64-bit code segment # use call far to switch to 64-bit code segment
ljmp $0x18, $1f ljmp $0x18, $1f
1: 1:
/* Pass the BIST result */ /* Pass the cpu_init_detected */
cvtsd2si %xmm1, %esi cvtsd2si %xmm1, %esi
/* Pass the cpu_init_detected */ /* Pass the BIST result */
cvtsd2si %xmm0, %edi cvtsd2si %xmm0, %edi
/* align the stack */ /* align the stack */
@@ -118,6 +119,7 @@ cache_as_ram_setup:
.code32 .code32
#else #else
/* Restore the BIST result */ /* Restore the BIST result */
cvtsd2si %xmm0, %edx cvtsd2si %xmm0, %edx