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

ArmPkg/CpuDxe: Stack Pointer is not 8-bytes aligned in AArch32 interrupt handling

Browse Source 
See section "2.1 The need to align SP to a multiple of 8 at conforming call sites" in
"Advisory Note. SP must be 8-byte aligned on entry to AAPCS-conforming functions"
Source: http://infocenter.arm.com/help/topic/com.arm.doc.ihi0046b/IHI0046B_ABI_Advisory_1.pdf

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Olivier Martin <olivier.martin@arm.com>



git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@15553 6f19259b-4bc3-4df7-8a09-765794883524
This commit is contained in:
Olivier Martin 2014-06-03 16:42:18 +00:00 committed by oliviermartin
parent 27331bff97
commit ec17f0f56a
4 changed files with 28 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
ArmPkg/Drivers/CpuDxe/AArch64/Exception.c
View File

@ -133,7 +133,7 @@ InitializeExceptions (
// AArch64 alignment? The Vector table must be 2k-byte aligned (bottom 11 bits zero)? // AArch64 alignment? The Vector table must be 2k-byte aligned (bottom 11 bits zero)?
//DEBUG ((EFI_D_ERROR, "vbar set addr: 0x%016lx\n",(UINTN)ExceptionHandlersStart)); //DEBUG ((EFI_D_ERROR, "vbar set addr: 0x%016lx\n",(UINTN)ExceptionHandlersStart));
//ASSERT(((UINTN)ExceptionHandlersStart & ((1 << 11)-1)) == 0); //ASSERT(((UINTN)ExceptionHandlersStart & ARM_VECTOR_TABLE_ALIGNMENT) == 0);
// We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector Base Address to point into CpuDxe code. // We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector Base Address to point into CpuDxe code.
ArmWriteVBar ((UINTN)ExceptionHandlersStart); ArmWriteVBar ((UINTN)ExceptionHandlersStart);

2
ArmPkg/Drivers/CpuDxe/ArmV6/Exception.c
View File

@ -209,7 +209,7 @@ InitializeExceptions (
ArmWriteVBar (PcdGet32(PcdCpuVectorBaseAddress)); ArmWriteVBar (PcdGet32(PcdCpuVectorBaseAddress));
} else { } else {
// The Vector table must be 32-byte aligned // The Vector table must be 32-byte aligned
ASSERT(((UINT32)ExceptionHandlersStart & ((1 << 5)-1)) == 0); ASSERT(((UINT32)ExceptionHandlersStart & ARM_VECTOR_TABLE_ALIGNMENT) == 0);
// We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector Base Address to point into CpuDxe code. // We do not copy the Exception Table at PcdGet32(PcdCpuVectorBaseAddress). We just set Vector Base Address to point into CpuDxe code.
ArmWriteVBar ((UINT32)ExceptionHandlersStart); ArmWriteVBar ((UINT32)ExceptionHandlersStart);

19
ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.S
View File

@ -3,6 +3,7 @@
# Use ARMv6 instruction to operate on a single stack # Use ARMv6 instruction to operate on a single stack
# #
# Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> # Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
# Copyright (c) 2014, ARM Limited. All rights reserved.<BR>
# #
# This program and the accompanying materials # This program and the accompanying materials
# are licensed and made available under the terms and conditions of the BSD License # are licensed and made available under the terms and conditions of the BSD License
@ -35,7 +36,7 @@ This is the stack constructed by the exception handler (low address to high addr
R10 0x28 R10 0x28
R11 0x2c R11 0x2c
R12 0x30 R12 0x30
SP 0x34 # reserved via adding 0x20 (32) to the SP SP 0x34 # reserved via subtraction 0x20 (32) from SP
LR 0x38 LR 0x38
PC 0x3c PC 0x3c
CPSR 0x40 CPSR 0x40
@ -220,7 +221,7 @@ ASM_PFX(AsmCommonExceptionEntry):
add R2, SP, #0x38 @ Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR add R2, SP, #0x38 @ Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR
and R3, R1, #0x1f @ Check CPSR to see if User or System Mode and R3, R1, #0x1f @ Check CPSR to see if User or System Mode
cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1df)) cmp R3, #0x1f @ if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R3, #0x10 @ cmpne R3, #0x10 @
stmeqed R2, {lr}^ @ save unbanked lr stmeqed R2, {lr}^ @ save unbanked lr
@ else @ else
@ -229,13 +230,13 @@ ASM_PFX(AsmCommonExceptionEntry):
ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd ldr R5, [SP, #0x58] @ PC is the LR pushed by srsfd
@ Check to see if we have to adjust for Thumb entry @ Check to see if we have to adjust for Thumb entry
sub r4, r0, #1 @ if (ExceptionType == 1 || ExceptionType ==2)) { sub r4, r0, #1 @ if (ExceptionType == 1 || ExceptionType == 2)) {
cmp r4, #1 @ // UND & SVC have differnt LR adjust for Thumb cmp r4, #1 @ // UND & SVC have differnt LR adjust for Thumb
bhi NoAdjustNeeded bhi NoAdjustNeeded
tst r1, #0x20 @ if ((CPSR & T)) == T) { // Thumb Mode on entry tst r1, #0x20 @ if ((CPSR & T)) == T) { // Thumb Mode on entry
addne R5, R5, #2 @ PC += 2@ addne R5, R5, #2 @ PC += 2;
str R5,[SP,#0x58] @ Update LR value pused by srsfd strne R5,[SP,#0x58] @ Update LR value pushed by srsfd
NoAdjustNeeded: NoAdjustNeeded:
@ -251,6 +252,10 @@ NoAdjustNeeded:
vpush {d0-d15} @ save vstm registers in case they are used in optimizations vpush {d0-d15} @ save vstm registers in case they are used in optimizations
#endif #endif
mov R4, SP @ Save current SP
tst R4, #4
subne SP, SP, #4 @ Adjust SP if not 8-byte aligned
/* /*
VOID VOID
EFIAPI EFIAPI
@ -262,6 +267,8 @@ CommonCExceptionHandler (
*/ */
blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler blx ASM_PFX(CommonCExceptionHandler) @ Call exception handler
mov SP, R4 @ Restore SP
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpop {d0-d15} vpop {d0-d15}
#endif #endif
@ -269,7 +276,7 @@ CommonCExceptionHandler (
ldr R1, [SP, #0x4c] @ Restore EFI_SYSTEM_CONTEXT_ARM.IFSR ldr R1, [SP, #0x4c] @ Restore EFI_SYSTEM_CONTEXT_ARM.IFSR
mcr p15, 0, R1, c5, c0, 1 @ Write IFSR mcr p15, 0, R1, c5, c0, 1 @ Write IFSR
ldr R1, [SP, #0x44] @ sRestore EFI_SYSTEM_CONTEXT_ARM.DFSR ldr R1, [SP, #0x44] @ Restore EFI_SYSTEM_CONTEXT_ARM.DFSR
mcr p15, 0, R1, c5, c0, 0 @ Write DFSR mcr p15, 0, R1, c5, c0, 0 @ Write DFSR
ldr R1,[SP,#0x3c] @ EFI_SYSTEM_CONTEXT_ARM.PC ldr R1,[SP,#0x3c] @ EFI_SYSTEM_CONTEXT_ARM.PC

19
ArmPkg/Drivers/CpuDxe/ArmV6/ExceptionSupport.asm
View File

@ -3,6 +3,7 @@
// Use ARMv6 instruction to operate on a single stack // Use ARMv6 instruction to operate on a single stack
// //
// Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR> // Copyright (c) 2008 - 2010, Apple Inc. All rights reserved.<BR>
// Copyright (c) 2014, ARM Limited. All rights reserved.<BR>
// //
// This program and the accompanying materials // This program and the accompanying materials
// are licensed and made available under the terms and conditions of the BSD License // are licensed and made available under the terms and conditions of the BSD License
@ -35,7 +36,7 @@ This is the stack constructed by the exception handler (low address to high addr
R10 0x28 R10 0x28
R11 0x2c R11 0x2c
R12 0x30 R12 0x30
SP 0x34 # reserved via adding 0x20 (32) to the SP SP 0x34 # reserved via subtraction 0x20 (32) from SP
LR 0x38 LR 0x38
PC 0x3c PC 0x3c
CPSR 0x40 CPSR 0x40
@ -215,7 +216,7 @@ AsmCommonExceptionEntry
add R2, SP, #0x38 ; Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR add R2, SP, #0x38 ; Make R2 point to EFI_SYSTEM_CONTEXT_ARM.LR
and R3, R1, #0x1f ; Check CPSR to see if User or System Mode and R3, R1, #0x1f ; Check CPSR to see if User or System Mode
cmp R3, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1df)) cmp R3, #0x1f ; if ((CPSR == 0x10) || (CPSR == 0x1f))
cmpne R3, #0x10 ; cmpne R3, #0x10 ;
stmeqed R2, {lr}^ ; save unbanked lr stmeqed R2, {lr}^ ; save unbanked lr
; else ; else
@ -224,13 +225,13 @@ AsmCommonExceptionEntry
ldr R5, [SP, #0x58] ; PC is the LR pushed by srsfd ldr R5, [SP, #0x58] ; PC is the LR pushed by srsfd
; Check to see if we have to adjust for Thumb entry ; Check to see if we have to adjust for Thumb entry
sub r4, r0, #1 ; if (ExceptionType == 1 || ExceptionType ==2)) { sub r4, r0, #1 ; if (ExceptionType == 1 || ExceptionType == 2)) {
cmp r4, #1 ; // UND & SVC have differnt LR adjust for Thumb cmp r4, #1 ; // UND & SVC have differnt LR adjust for Thumb
bhi NoAdjustNeeded bhi NoAdjustNeeded
tst r1, #0x20 ; if ((CPSR & T)) == T) { // Thumb Mode on entry tst r1, #0x20 ; if ((CPSR & T)) == T) { // Thumb Mode on entry
addne R5, R5, #2 ; PC += 2; addne R5, R5, #2 ; PC += 2;
str R5,[SP,#0x58] ; Update LR value pused by srsfd strne R5,[SP,#0x58] ; Update LR value pushed by srsfd
NoAdjustNeeded NoAdjustNeeded
@ -243,9 +244,13 @@ NoAdjustNeeded
mov R1,SP ; R1 is SystemContext mov R1,SP ; R1 is SystemContext
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpush {d0-d15} ; save vstm registers in case they are used in optimizations vpush {d0-d15} ; save vstm registers in case they are used in optimizations
#endif #endif
mov R4, SP ; Save current SP
tst R4, #4
subne SP, SP, #4 ; Adjust SP if not 8-byte aligned
/* /*
VOID VOID
EFIAPI EFIAPI
@ -257,6 +262,8 @@ CommonCExceptionHandler (
*/ */
blx CommonCExceptionHandler ; Call exception handler blx CommonCExceptionHandler ; Call exception handler
mov SP, R4 ; Restore SP
#if (FixedPcdGet32(PcdVFPEnabled)) #if (FixedPcdGet32(PcdVFPEnabled))
vpop {d0-d15} vpop {d0-d15}
#endif #endif
@ -264,7 +271,7 @@ CommonCExceptionHandler (
ldr R1, [SP, #0x4c] ; Restore EFI_SYSTEM_CONTEXT_ARM.IFSR ldr R1, [SP, #0x4c] ; Restore EFI_SYSTEM_CONTEXT_ARM.IFSR
mcr p15, 0, R1, c5, c0, 1 ; Write IFSR mcr p15, 0, R1, c5, c0, 1 ; Write IFSR
ldr R1, [SP, #0x44] ; sRestore EFI_SYSTEM_CONTEXT_ARM.DFSR ldr R1, [SP, #0x44] ; Restore EFI_SYSTEM_CONTEXT_ARM.DFSR
mcr p15, 0, R1, c5, c0, 0 ; Write DFSR mcr p15, 0, R1, c5, c0, 0 ; Write DFSR
ldr R1,[SP,#0x3c] ; EFI_SYSTEM_CONTEXT_ARM.PC ldr R1,[SP,#0x3c] ; EFI_SYSTEM_CONTEXT_ARM.PC