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

vendorcode/amd/agesa: Tidy up gcccar.inc 

Change register preservations and fix comments about register
usage accordingly. Do this to avoid use of %mm0-2 registers inside
macros defined in gcccar.inc, as future implementation of
C_BOOTBLOCK_ENVIRONMENT will use them as well.

Adjust caller side accordingly.

Change-Id: Ic76fcc31ae714baf5259d17c41b62a3610aa947b
Signed-off-by: Marshall Dawson <marshalldawson3rd@gmail.com>
Signed-off-by: Kyösti Mälkki <kyosti.malkki@gmail.com>
Reviewed-on: https://review.coreboot.org/20579
Tested-by: build bot (Jenkins) <no-reply@coreboot.org>
Reviewed-by: Marc Jones <marc@marcjonesconsulting.com>
This commit is contained in:
Kyösti Mälkki 2017-07-12 16:30:47 +03:00
parent 5a0d29d460
commit fec6fa799c
7 changed files with 35 additions and 116 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -32,7 +32,7 @@
cache_as_ram_setup: cache_as_ram_setup:
/* Preserve BIST. */ /* Preserve BIST. */
movl %eax, %ebp movd %eax, %mm0
post_code(0xa0) post_code(0xa0)
@ -45,7 +45,6 @@ cache_as_ram_setup:
post_code(0xa1) post_code(0xa1)
/* NOTE: %ebx, %ebp are preserved in AMD_ENABLE_STACK. */
AMD_ENABLE_STACK AMD_ENABLE_STACK
/* Align the stack. */ /* Align the stack. */
@ -96,19 +95,18 @@ cache_as_ram_setup:
#endif #endif
/* Calling conventions preserve BIST in %ebp. */
call early_all_cores call early_all_cores
/* Must maintain 16-byte stack alignment here. */ /* Must maintain 16-byte stack alignment here. */
pushl $0x0 pushl $0x0
pushl $0x0 pushl $0x0
pushl $0x0 pushl $0x0
pushl %ebp movd %mm0, %eax /* bist */
pushl %eax
call romstage_main call romstage_main
movl %eax, %ebx movl %eax, %esp
/* Register %ebx is new stacktop for remaining of romstage. /* Register %esp is new stacktop for remaining of romstage.
* It is the only register preserved in AMD_DISABLE_STACK. * It is the only register preserved in AMD_DISABLE_STACK.
*/ */
@ -125,7 +123,6 @@ disable_cache_as_ram:
andl $0x9fffffff, %eax andl $0x9fffffff, %eax
movl %eax, %cr0 movl %eax, %cr0
movl %ebx, %esp
call romstage_after_car call romstage_after_car
/* Should never see this postcode */ /* Should never see this postcode */

23
src/vendorcode/amd/agesa/f10/gcccar.inc
View File

@ -1201,7 +1201,7 @@ node_core_f15_exit:
* AMD_ENABLE_STACK: Setup a stack * AMD_ENABLE_STACK: Setup a stack
* *
* In: * In:
* EBX = Return address (preserved) * No inputs
* *
* Out: * Out:
* SS:ESP - Our new private stack location * SS:ESP - Our new private stack location
@ -1212,11 +1212,8 @@ node_core_f15_exit:
* *
* Requirements: * Requirements:
* * This routine presently is limited to a max of 64 processor cores * * This routine presently is limited to a max of 64 processor cores
* Preserved:
* ebx ebp
* Destroyed: * Destroyed:
* eax, ecx, edx, edi, esi, ds, es, ss, esp * EBX, EDX, EDI, ESI, EBP, DS, ES
* mmx0, mmx1
* *
* Description: * Description:
* Fixed MTRR address allocation to cores: * Fixed MTRR address allocation to cores:
@ -1276,8 +1273,6 @@ node_core_f15_exit:
# Note that SS:ESP will be default stack. Note that this stack # Note that SS:ESP will be default stack. Note that this stack
# routine will not be used after memory has been initialized. Because # routine will not be used after memory has been initialized. Because
# of its limited lifetime, it will not conflict with typical PCI devices. # of its limited lifetime, it will not conflict with typical PCI devices.
movd %ebx, %mm0 # Put return address in a safe place
movd %ebp, %mm1 # Save some other user registers
# get node id and core id of current executing core # get node id and core id of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node)
@ -1589,9 +1584,6 @@ ClearTheStack: # Stack base is in SS, stack pointer is
or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up) or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up)
#.endif #.endif
0: 0:
movd %mm0, %ebx # Restore return address
movd %mm1, %ebp
.endm .endm
/***************************************************************************** /*****************************************************************************
@ -1611,17 +1603,15 @@ ClearTheStack: # Stack base is in SS, stack pointer is
* none * none
* *
* Out: * Out:
* EAX = AGESA_SUCCESS * none
* *
* Preserved: * Preserved:
* ebx * ESP
* Destroyed: * Destroyed:
* eax, ecx, edx, esp * EAX, EBX, ECX, EDX, EDI, ESI
*****************************************************************************/ *****************************************************************************/
.macro AMD_DISABLE_STACK .macro AMD_DISABLE_STACK
mov %ebx, %esp # Save return address
# get node/core/flags of current executing core # get node/core/flags of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node)
@ -1647,7 +1637,4 @@ ClearTheStack: # Stack base is in SS, stack pointer is
AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations
mov %esp, %ebx
xor %eax, %eax
.endm .endm

23
src/vendorcode/amd/agesa/f12/gcccar.inc
View File

@ -1181,7 +1181,7 @@ node_core_f15_exit:
* AMD_ENABLE_STACK: Setup a stack * AMD_ENABLE_STACK: Setup a stack
* *
* In: * In:
* EBX = Return address (preserved) * No inputs
* *
* Out: * Out:
* SS:ESP - Our new private stack location * SS:ESP - Our new private stack location
@ -1192,11 +1192,8 @@ node_core_f15_exit:
* *
* Requirements: * Requirements:
* * This routine presently is limited to a max of 64 processor cores * * This routine presently is limited to a max of 64 processor cores
* Preserved:
* ebx ebp
* Destroyed: * Destroyed:
* eax, ecx, edx, edi, esi, ds, es, ss, esp * EBX, EDX, EDI, ESI, EBP, DS, ES
* mmx0, mmx1
* *
* Description: * Description:
* Fixed MTRR address allocation to cores: * Fixed MTRR address allocation to cores:
@ -1256,8 +1253,6 @@ node_core_f15_exit:
# Note that SS:ESP will be default stack. Note that this stack # Note that SS:ESP will be default stack. Note that this stack
# routine will not be used after memory has been initialized. Because # routine will not be used after memory has been initialized. Because
# of its limited lifetime, it will not conflict with typical PCI devices. # of its limited lifetime, it will not conflict with typical PCI devices.
movd %ebx, %mm0 # Put return address in a safe place
movd %ebp, %mm1 # Save some other user registers
# get node id and core id of current executing core # get node id and core id of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node)
@ -1569,9 +1564,6 @@ ClearTheStack: # Stack base is in SS, stack pointer is
or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up) or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up)
#.endif #.endif
0: 0:
movd %mm0, %ebx # Restore return address
movd %mm1, %ebp
.endm .endm
/***************************************************************************** /*****************************************************************************
@ -1582,17 +1574,15 @@ ClearTheStack: # Stack base is in SS, stack pointer is
* none * none
* *
* Out: * Out:
* EAX = AGESA_SUCCESS * none
* *
* Preserved: * Preserved:
* ebx * ESP
* Destroyed: * Destroyed:
* eax, ecx, edx, esp * EAX, EBX, ECX, EDX, EDI, ESI
*****************************************************************************/ *****************************************************************************/
.macro AMD_DISABLE_STACK .macro AMD_DISABLE_STACK
mov %ebx, %esp # Save return address
# get node/core/flags of current executing core # get node/core/flags of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node)
@ -1618,7 +1608,4 @@ ClearTheStack: # Stack base is in SS, stack pointer is
AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations
mov %esp, %ebx
xor %eax, %eax
.endm .endm

23
src/vendorcode/amd/agesa/f14/gcccar.inc
View File

@ -1181,7 +1181,7 @@ node_core_f15_exit:
* AMD_ENABLE_STACK: Setup a stack * AMD_ENABLE_STACK: Setup a stack
* *
* In: * In:
* EBX = Return address (preserved) * No inputs
* *
* Out: * Out:
* SS:ESP - Our new private stack location * SS:ESP - Our new private stack location
@ -1192,11 +1192,8 @@ node_core_f15_exit:
* *
* Requirements: * Requirements:
* * This routine presently is limited to a max of 64 processor cores * * This routine presently is limited to a max of 64 processor cores
* Preserved:
* ebx ebp
* Destroyed: * Destroyed:
* eax, ecx, edx, edi, esi, ds, es, ss, esp * EBX, EDX, EDI, ESI, EBP, DS, ES
* mmx0, mmx1
* *
* Description: * Description:
* Fixed MTRR address allocation to cores: * Fixed MTRR address allocation to cores:
@ -1256,8 +1253,6 @@ node_core_f15_exit:
# Note that SS:ESP will be default stack. Note that this stack # Note that SS:ESP will be default stack. Note that this stack
# routine will not be used after memory has been initialized. Because # routine will not be used after memory has been initialized. Because
# of its limited lifetime, it will not conflict with typical PCI devices. # of its limited lifetime, it will not conflict with typical PCI devices.
movd %ebx, %mm0 # Put return address in a safe place
movd %ebp, %mm1 # Save some other user registers
# get node id and core id of current executing core # get node id and core id of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node)
@ -1569,9 +1564,6 @@ ClearTheStack: # Stack base is in SS, stack pointer is
or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up) or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up)
#.endif #.endif
0: 0:
movd %mm0, %ebx # Restore return address
movd %mm1, %ebp
.endm .endm
/***************************************************************************** /*****************************************************************************
@ -1582,17 +1574,15 @@ ClearTheStack: # Stack base is in SS, stack pointer is
* none * none
* *
* Out: * Out:
* EAX = AGESA_SUCCESS * none
* *
* Preserved: * Preserved:
* ebx * ESP
* Destroyed: * Destroyed:
* eax, ecx, edx, esp * EAX, EBX, ECX, EDX, EDI, ESI
*****************************************************************************/ *****************************************************************************/
.macro AMD_DISABLE_STACK .macro AMD_DISABLE_STACK
mov %ebx, %esp # Save return address
# get node/core/flags of current executing core # get node/core/flags of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node)
@ -1618,7 +1608,4 @@ ClearTheStack: # Stack base is in SS, stack pointer is
AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations
mov %esp, %ebx
xor %eax, %eax
.endm .endm

23
src/vendorcode/amd/agesa/f15/gcccar.inc
View File

@ -1216,7 +1216,7 @@ node_core_f15_exit:
* AMD_ENABLE_STACK: Setup a stack * AMD_ENABLE_STACK: Setup a stack
* *
* In: * In:
* EBX = Return address (preserved) * No inputs
* *
* Out: * Out:
* SS:ESP - Our new private stack location * SS:ESP - Our new private stack location
@ -1227,11 +1227,8 @@ node_core_f15_exit:
* *
* Requirements: * Requirements:
* * This routine presently is limited to a max of 64 processor cores * * This routine presently is limited to a max of 64 processor cores
* Preserved:
* ebx ebp
* Destroyed: * Destroyed:
* eax, ecx, edx, edi, esi, ds, es, ss, esp * EBX, EDX, EDI, ESI, EBP, DS, ES
* mmx0, mmx1
* *
* Description: * Description:
* Fixed MTRR address allocation to cores: * Fixed MTRR address allocation to cores:
@ -1291,8 +1288,6 @@ node_core_f15_exit:
# Note that SS:ESP will be default stack. Note that this stack # Note that SS:ESP will be default stack. Note that this stack
# routine will not be used after memory has been initialized. Because # routine will not be used after memory has been initialized. Because
# of its limited lifetime, it will not conflict with typical PCI devices. # of its limited lifetime, it will not conflict with typical PCI devices.
movd %ebx, %mm0 # Put return address in a safe place
movd %ebp, %mm1 # Save some other user registers
# get node id and core id of current executing core # get node id and core id of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node)
@ -1604,9 +1599,6 @@ ClearTheStack: # Stack base is in SS, stack pointer is
or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up) or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up)
#.endif #.endif
0: 0:
movd %mm0, %ebx # Restore return address
movd %mm1, %ebp
.endm .endm
/***************************************************************************** /*****************************************************************************
@ -1626,17 +1618,15 @@ ClearTheStack: # Stack base is in SS, stack pointer is
* none * none
* *
* Out: * Out:
* EAX = AGESA_SUCCESS * none
* *
* Preserved: * Preserved:
* ebx * ESP
* Destroyed: * Destroyed:
* eax, ecx, edx, esp * EAX, EBX, ECX, EDX, EDI, ESI
*****************************************************************************/ *****************************************************************************/
.macro AMD_DISABLE_STACK .macro AMD_DISABLE_STACK
mov %ebx, %esp # Save return address
# get node/core/flags of current executing core # get node/core/flags of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node)
@ -1662,7 +1652,4 @@ ClearTheStack: # Stack base is in SS, stack pointer is
AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations
mov %esp, %ebx
xor %eax, %eax
.endm .endm

23
src/vendorcode/amd/agesa/f15tn/gcccar.inc
View File

@ -1511,7 +1511,7 @@ node_core_f15_exit:
* AMD_ENABLE_STACK: Setup a stack * AMD_ENABLE_STACK: Setup a stack
* *
* In: * In:
* EBX = Return address (preserved) * No inputs
* *
* Out: * Out:
* SS:ESP - Our new private stack location * SS:ESP - Our new private stack location
@ -1522,11 +1522,8 @@ node_core_f15_exit:
* *
* Requirements: * Requirements:
* * This routine presently is limited to a max of 64 processor cores * * This routine presently is limited to a max of 64 processor cores
* Preserved:
* ebx ebp
* Destroyed: * Destroyed:
* eax, ecx, edx, edi, esi, ds, es, ss, esp * EBX, EDX, EDI, ESI, EBP, DS, ES
* mmx0, mmx1
* *
* Description: * Description:
* Fixed MTRR address allocation to cores: * Fixed MTRR address allocation to cores:
@ -1586,8 +1583,6 @@ node_core_f15_exit:
# Note that SS:ESP will be default stack. Note that this stack # Note that SS:ESP will be default stack. Note that this stack
# routine will not be used after memory has been initialized. Because # routine will not be used after memory has been initialized. Because
# of its limited lifetime, it will not conflict with typical PCI devices. # of its limited lifetime, it will not conflict with typical PCI devices.
movd %ebx, %mm0 # Put return address in a safe place
movd %ebp, %mm1 # Save some other user registers
# get node id and core id of current executing core # get node id and core id of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node)
@ -1899,9 +1894,6 @@ ClearTheStack: # Stack base is in SS, stack pointer is
or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up) or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up)
#.endif #.endif
0: 0:
movd %mm0, %ebx # Restore return address
movd %mm1, %ebp
.endm .endm
/***************************************************************************** /*****************************************************************************
@ -1921,17 +1913,15 @@ ClearTheStack: # Stack base is in SS, stack pointer is
* none * none
* *
* Out: * Out:
* EAX = AGESA_SUCCESS * none
* *
* Preserved: * Preserved:
* ebx * ESP
* Destroyed: * Destroyed:
* eax, ecx, edx, esp * EAX, EBX, ECX, EDX, EDI, ESI
*****************************************************************************/ *****************************************************************************/
.macro AMD_DISABLE_STACK .macro AMD_DISABLE_STACK
mov %ebx, %esp # Save return address
# get node/core/flags of current executing core # get node/core/flags of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node)
@ -1957,7 +1947,4 @@ ClearTheStack: # Stack base is in SS, stack pointer is
AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations
mov %esp, %ebx
xor %eax, %eax
.endm .endm

23
src/vendorcode/amd/agesa/f16kb/gcccar.inc
View File

@ -874,7 +874,7 @@ node_core_f16_exit:
* AMD_ENABLE_STACK: Setup a stack * AMD_ENABLE_STACK: Setup a stack
* *
* In: * In:
* EBX = Return address (preserved) * No inputs
* *
* Out: * Out:
* SS:ESP - Our new private stack location * SS:ESP - Our new private stack location
@ -885,11 +885,8 @@ node_core_f16_exit:
* *
* Requirements: * Requirements:
* * This routine presently is limited to a max of 64 processor cores * * This routine presently is limited to a max of 64 processor cores
* Preserved:
* ebx ebp
* Destroyed: * Destroyed:
* eax, ecx, edx, edi, esi, ds, es, ss, esp * EBX, EDX, EDI, ESI, EBP, DS, ES
* mmx0, mmx1
* *
* Description: * Description:
* Fixed MTRR address allocation to cores: * Fixed MTRR address allocation to cores:
@ -949,8 +946,6 @@ node_core_f16_exit:
# Note that SS:ESP will be default stack. Note that this stack # Note that SS:ESP will be default stack. Note that this stack
# routine will not be used after memory has been initialized. Because # routine will not be used after memory has been initialized. Because
# of its limited lifetime, it will not conflict with typical PCI devices. # of its limited lifetime, it will not conflict with typical PCI devices.
movd %ebx, %mm0 # Put return address in a safe place
movd %ebp, %mm1 # Save some other user registers
# get node id and core id of current executing core # get node id and core id of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[23:16]=Shared core## SI[15,8]= Node## SI[7,0]= core# (relative to node)
@ -1262,9 +1257,6 @@ ClearTheStack: # Stack base is in SS, stack pointer is
or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up) or $0x40000000, %eax # eax = AGESA_WARNING (Stack has already been set up)
#.endif #.endif
0: 0:
movd %mm0, %ebx # Restore return address
movd %mm1, %ebp
.endm .endm
/***************************************************************************** /*****************************************************************************
@ -1284,17 +1276,15 @@ ClearTheStack: # Stack base is in SS, stack pointer is
* none * none
* *
* Out: * Out:
* EAX = AGESA_SUCCESS * none
* *
* Preserved: * Preserved:
* ebx * ESP
* Destroyed: * Destroyed:
* eax, ecx, edx, esp * EAX, EBX, ECX, EDX, EDI, ESI
*****************************************************************************/ *****************************************************************************/
.macro AMD_DISABLE_STACK .macro AMD_DISABLE_STACK
mov %ebx, %esp # Save return address
# get node/core/flags of current executing core # get node/core/flags of current executing core
GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node) GET_NODE_ID_CORE_ID # Sets ESI[15,8]= Node#; ESI[7,0]= core# (relative to node)
@ -1320,7 +1310,4 @@ ClearTheStack: # Stack base is in SS, stack pointer is
AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations AMD_DISABLE_STACK_FAMILY_HOOK # Re-Enable 'normal' cache operations
mov %esp, %ebx
xor %eax, %eax
.endm .endm