Attention is currently required from: Arthur Heymans. Hello Arthur Heymans,
I'd like you to do a code review. Please visit
https://review.coreboot.org/c/coreboot/+/63045
to review the following change.
Change subject: amd/*/gcccar.inc: Remove local declarations ......................................................................
amd/*/gcccar.inc: Remove local declarations
Although useful to declare local symbols inside macros clang does not support them. With BUILD_TIMELESS=1 the binaries don't change and do build with GCC so nothing is lost here.
Change-Id: I01054e2bdcb63810b21eb51b46bdc6e1bd999516 Signed-off-by: Arthur Heymans arthur@aheymans.xyz --- M src/vendorcode/amd/agesa/f14/gcccar.inc M src/vendorcode/amd/agesa/f15tn/gcccar.inc M src/vendorcode/amd/agesa/f16kb/gcccar.inc M src/vendorcode/amd/pi/00670F00/binaryPI/gcccar.inc M src/vendorcode/amd/pi/00730F01/binaryPI/gcccar.inc 5 files changed, 0 insertions(+), 79 deletions(-)
git pull ssh://review.coreboot.org:29418/coreboot refs/changes/45/63045/1
diff --git a/src/vendorcode/amd/agesa/f14/gcccar.inc b/src/vendorcode/amd/agesa/f14/gcccar.inc index 95dd74d..7e0605f 100644 --- a/src/vendorcode/amd/agesa/f14/gcccar.inc +++ b/src/vendorcode/amd/agesa/f14/gcccar.inc @@ -245,7 +245,6 @@ * SI[31:27]= reserved, =0 ****************************************************************************/ .macro GET_NODE_ID_CORE_ID - LOCAL node_core_exit
mov $-1, %si GET_NODE_ID_CORE_ID_F10 @@ -297,7 +296,6 @@ # * No INVD or WBINVD, no exceptions, page faults or interrupts ****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F10 - LOCAL fam10_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -378,7 +376,6 @@ *****************************************************************************/
.macro AMD_DISABLE_STACK_FAMILY_HOOK_F10 - LOCAL fam10_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -448,8 +445,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F10
- LOCAL node_core_f10_exit - LOCAL node_core_f10_AP
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f10_exit # Br if yes @@ -564,7 +559,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F12 - LOCAL fam12_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -627,7 +621,6 @@ * * MSRC001_1029[ClflushSerialize]=0 *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F12 - LOCAL fam12_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -690,7 +683,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F12
- LOCAL node_core_f12_exit
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f12_exit # Br if yes @@ -730,7 +722,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F14 - LOCAL fam14_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -783,7 +774,6 @@ * * MSRC001_1022[DIS_HW_PF]=0. *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F14 - LOCAL fam14_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -838,7 +828,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F14
- LOCAL node_core_f14_exit
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f14_exit # Br if yes @@ -885,7 +874,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F15 - LOCAL fam15_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -946,7 +934,6 @@ * * MSRC001_1022[DIS_HW_PF]=0 *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F15 - LOCAL fam15_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -1023,9 +1010,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F15
- LOCAL node_core_f15_exit - LOCAL node_core_f15_AP - LOCAL node_core_f15_shared
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f15_exit # Br if yes @@ -1245,10 +1229,6 @@ .macro AMD_ENABLE_STACK
# These are local labels. Declared so linker doesn't cause 'redefined label' errors - LOCAL SetupStack - LOCAL Real16bMode - LOCAL Protected32Mode - LOCAL ClearTheStack
# Note that SS:ESP will be default stack. Note that this stack # routine will not be used after memory has been initialized. Because diff --git a/src/vendorcode/amd/agesa/f15tn/gcccar.inc b/src/vendorcode/amd/agesa/f15tn/gcccar.inc index fb49c17..a6cfd24 100644 --- a/src/vendorcode/amd/agesa/f15tn/gcccar.inc +++ b/src/vendorcode/amd/agesa/f15tn/gcccar.inc @@ -286,7 +286,6 @@ * SI[31:27]= reserved, =0 ****************************************************************************/ .macro GET_NODE_ID_CORE_ID - LOCAL node_core_exit
mov $-1, %si GET_NODE_ID_CORE_ID_F10 @@ -338,7 +337,6 @@ # * No INVD or WBINVD, no exceptions, page faults or interrupts ****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F10 - LOCAL fam10_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -419,7 +417,6 @@ *****************************************************************************/
.macro AMD_DISABLE_STACK_FAMILY_HOOK_F10 - LOCAL fam10_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -489,8 +486,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F10
- LOCAL node_core_f10_exit - LOCAL node_core_f10_AP
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f10_exit # Br if yes @@ -604,7 +599,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F12 - LOCAL fam12_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -667,7 +661,6 @@ * * MSRC001_1029[ClflushSerialize]=0 *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F12 - LOCAL fam12_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -730,7 +723,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F12
- LOCAL node_core_f12_exit
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f12_exit # Br if yes @@ -770,7 +762,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F14 - LOCAL fam14_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -823,7 +814,6 @@ * * MSRC001_1022[DIS_HW_PF]=0. *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F14 - LOCAL fam14_disable_stack_hook_exit
AMD_CPUID $CPUID_MODEL shr $20, %eax # AL = cpu extended family @@ -878,7 +868,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F14
- LOCAL node_core_f14_exit
cmp $-1, %si # Has node/core already been discovered? jnz node_core_f14_exit # Br if yes @@ -923,7 +912,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F15 - LOCAL fam15_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -1047,8 +1035,6 @@ * * MSRC001_1022[DIS_HW_PF]=0 *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F15 - LOCAL fam15_disable_stack_hook_exit - LOCAL fam15_disable_stack_remote_read_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -1317,10 +1303,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F15
- LOCAL node_core_f15_exit - LOCAL node_core_f15_AP - LOCAL node_core_f15_shared - LOCAL node_core_f15_AP_not_TN
#define F15_L2Size 512 #define F15_ShareCores 2 @@ -1561,10 +1543,6 @@ .macro AMD_ENABLE_STACK
# These are local labels. Declared so linker doesn't cause 'redefined label' errors - LOCAL SetupStack - LOCAL Real16bMode - LOCAL Protected32Mode - LOCAL ClearTheStack
# Note that SS:ESP will be default stack. Note that this stack # routine will not be used after memory has been initialized. Because diff --git a/src/vendorcode/amd/agesa/f16kb/gcccar.inc b/src/vendorcode/amd/agesa/f16kb/gcccar.inc index 9c7bf47..a34840d 100644 --- a/src/vendorcode/amd/agesa/f16kb/gcccar.inc +++ b/src/vendorcode/amd/agesa/f16kb/gcccar.inc @@ -281,7 +281,6 @@ * SI[31:27]= reserved, =0 ****************************************************************************/ .macro GET_NODE_ID_CORE_ID - LOCAL node_core_exit
mov $-1, %si GET_NODE_ID_CORE_ID_F16 @@ -335,7 +334,6 @@ */
.macro AMD_ENABLE_STACK_FAMILY_HOOK_F16 - LOCAL fam16_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -400,9 +398,6 @@ ;--------------------------------------------------- */ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F16 - LOCAL fam16_disable_stack_hook_exit - LOCAL fam16_disable_stack_remote_read_exit -# LOCAL fam16_invd_done_remote_read_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -722,10 +717,6 @@ */ .macro GET_NODE_ID_CORE_ID_F16
- LOCAL node_core_f16_exit - LOCAL node_core_f16_AP - LOCAL node_core_f16_shared - LOCAL node_core_f16_AP_not_TN
#define F16_L2Size 1024 #define F16_ShareCores 4 @@ -925,10 +916,6 @@ .macro AMD_ENABLE_STACK
# These are local labels. Declared so linker doesn't cause 'redefined label' errors - LOCAL SetupStack - LOCAL Real16bMode - LOCAL Protected32Mode - LOCAL ClearTheStack
# Note that SS:ESP will be default stack. Note that this stack # routine will not be used after memory has been initialized. Because diff --git a/src/vendorcode/amd/pi/00670F00/binaryPI/gcccar.inc b/src/vendorcode/amd/pi/00670F00/binaryPI/gcccar.inc index 152e279..35c0fee 100644 --- a/src/vendorcode/amd/pi/00670F00/binaryPI/gcccar.inc +++ b/src/vendorcode/amd/pi/00670F00/binaryPI/gcccar.inc @@ -290,7 +290,6 @@ * SI[31:27]= reserved, =0 ****************************************************************************/ .macro GET_NODE_ID_CORE_ID - LOCAL node_core_exit
mov $-1, %si //GET_NODE_ID_CORE_ID_F10 @@ -340,7 +339,6 @@ * * No INVD or WBINVD, no exceptions, page faults or interrupts *****************************************************************************/ .macro AMD_ENABLE_STACK_FAMILY_HOOK_F15 - LOCAL fam15_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -415,8 +413,6 @@ * * MSRC001_1022[DIS_HW_PF]=0 *****************************************************************************/ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F15 - LOCAL fam15_disable_stack_hook_exit - LOCAL fam15_disable_stack_remote_read_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -703,9 +699,6 @@ *****************************************************************************/ .macro GET_NODE_ID_CORE_ID_F15
- LOCAL node_core_f15_exit - LOCAL node_core_f15_AP - LOCAL node_core_f15_shared
#define F15_L2Size 512 #define F15_ShareCores 2 @@ -947,10 +940,6 @@ .macro AMD_ENABLE_STACK
# These are local labels. Declared so linker doesn't cause 'redefined label' errors - LOCAL SetupStack - LOCAL Real16bMode - LOCAL Protected32Mode - LOCAL ClearTheStack
# Note that SS:ESP will be default stack. Note that this stack # routine will not be used after memory has been initialized. Because diff --git a/src/vendorcode/amd/pi/00730F01/binaryPI/gcccar.inc b/src/vendorcode/amd/pi/00730F01/binaryPI/gcccar.inc index ef08c87..cfebdc2 100644 --- a/src/vendorcode/amd/pi/00730F01/binaryPI/gcccar.inc +++ b/src/vendorcode/amd/pi/00730F01/binaryPI/gcccar.inc @@ -281,7 +281,6 @@ * SI[31:27]= reserved, =0 ****************************************************************************/ .macro GET_NODE_ID_CORE_ID - LOCAL node_core_exit
mov $-1, %si GET_NODE_ID_CORE_ID_F16 @@ -335,7 +334,6 @@ */
.macro AMD_ENABLE_STACK_FAMILY_HOOK_F16 - LOCAL fam16_enable_stack_hook_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -400,9 +398,6 @@ ;--------------------------------------------------- */ .macro AMD_DISABLE_STACK_FAMILY_HOOK_F16 - LOCAL fam16_disable_stack_hook_exit - LOCAL fam16_disable_stack_remote_read_exit -# LOCAL fam16_invd_done_remote_read_exit
AMD_CPUID $CPUID_MODEL mov %eax, %ebx # Save revision info to EBX @@ -729,10 +724,6 @@ */ .macro GET_NODE_ID_CORE_ID_F16
- LOCAL node_core_f16_exit - LOCAL node_core_f16_AP - LOCAL node_core_f16_shared - LOCAL node_core_f16_AP_not_TN
#define F16_L2Size 1024 #define F16_ShareCores 4 @@ -932,10 +923,6 @@ .macro AMD_ENABLE_STACK
# These are local labels. Declared so linker doesn't cause 'redefined label' errors - LOCAL SetupStack - LOCAL Real16bMode - LOCAL Protected32Mode - LOCAL ClearTheStack
# Note that SS:ESP will be default stack. Note that this stack # routine will not be used after memory has been initialized. Because
-
Arthur Heymans (Code Review)