tyler.durden
/
audk
mirror of https://github.com/acidanthera/audk.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

ArmVirtPkg/PrePi: use correct callee saved regs 

Both the ARM and the AARCH64 versions of the PrePi code (shared between
ArmVirtQemuKernel and ArmVirtXen) 'preserve' values across a function
call using registers that are not in fact callee saved. So fix that.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>
This commit is contained in:
Ard Biesheuvel 2016-08-05 16:41:32 +02:00
parent af90df3cb0
commit 298f836123
2 changed files with 20 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

30
ArmVirtPkg/PrePi/AArch64/ModuleEntryPoint.S
View File

@ -71,7 +71,7 @@ ASM_PFX(_ModuleEntryPoint):
// Get ID of this CPU in Multicore system // Get ID of this CPU in Multicore system
bl ASM_PFX(ArmReadMpidr) bl ASM_PFX(ArmReadMpidr)
// Keep a copy of the MpId register value // Keep a copy of the MpId register value
mov x10, x0 mov x20, x0
// Check if we can install the stack at the top of the System Memory or if we need // Check if we can install the stack at the top of the System Memory or if we need
// to install the stacks at the bottom of the Firmware Device (case the FD is located // to install the stacks at the bottom of the Firmware Device (case the FD is located
@ -113,40 +113,40 @@ _SetupStack:
// Because the 'push' instruction is equivalent to 'stmdb' (decrement before), we need to increment // Because the 'push' instruction is equivalent to 'stmdb' (decrement before), we need to increment
// one to the top of the stack. We check if incrementing one does not overflow (case of DRAM at the // one to the top of the stack. We check if incrementing one does not overflow (case of DRAM at the
// top of the memory space) // top of the memory space)
adds x11, x1, #1 adds x21, x1, #1
b.cs _SetupOverflowStack b.cs _SetupOverflowStack
_SetupAlignedStack: _SetupAlignedStack:
mov x1, x11 mov x1, x21
b _GetBaseUefiMemory b _GetBaseUefiMemory
_SetupOverflowStack: _SetupOverflowStack:
// Case memory at the top of the address space. Ensure the top of the stack is EFI_PAGE_SIZE // Case memory at the top of the address space. Ensure the top of the stack is EFI_PAGE_SIZE
// aligned (4KB) // aligned (4KB)
LoadConstantToReg (EFI_PAGE_MASK, x11) LoadConstantToReg (EFI_PAGE_MASK, x21)
and x11, x11, x1 and x21, x21, x1
sub x1, x1, x11 sub x1, x1, x21
_GetBaseUefiMemory: _GetBaseUefiMemory:
// Calculate the Base of the UEFI Memory // Calculate the Base of the UEFI Memory
sub x11, x1, x4 sub x21, x1, x4
_GetStackBase: _GetStackBase:
// r1 = The top of the Mpcore Stacks // r1 = The top of the Mpcore Stacks
// Stack for the primary core = PrimaryCoreStack // Stack for the primary core = PrimaryCoreStack
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), x2) LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), x2)
sub x12, x1, x2 sub x22, x1, x2
// Stack for the secondary core = Number of Cores - 1 // Stack for the secondary core = Number of Cores - 1
LoadConstantToReg (FixedPcdGet32(PcdCoreCount), x0) LoadConstantToReg (FixedPcdGet32(PcdCoreCount), x0)
sub x0, x0, #1 sub x0, x0, #1
LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), x1) LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), x1)
mul x1, x1, x0 mul x1, x1, x0
sub x12, x12, x1 sub x22, x22, x1
// x12 = The base of the MpCore Stacks (primary stack & secondary stacks) // x22 = The base of the MpCore Stacks (primary stack & secondary stacks)
mov x0, x12 mov x0, x22
mov x1, x10 mov x1, x20
//ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize) //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), x2) LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), x2)
LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), x3) LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), x3)
@ -159,9 +159,9 @@ _GetStackBase:
bne _PrepareArguments bne _PrepareArguments
_PrepareArguments: _PrepareArguments:
mov x0, x10 mov x0, x20
mov x1, x11 mov x1, x21
mov x2, x12 mov x2, x22
// Move sec startup address into a data register // Move sec startup address into a data register
// Ensure we're jumping to FV version of the code (not boot remapped alias) // Ensure we're jumping to FV version of the code (not boot remapped alias)

10
ArmVirtPkg/PrePi/Arm/ModuleEntryPoint.S
View File

@ -154,17 +154,17 @@ _GetStackBase:
// r1 = The top of the Mpcore Stacks // r1 = The top of the Mpcore Stacks
// Stack for the primary core = PrimaryCoreStack // Stack for the primary core = PrimaryCoreStack
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2) LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)
sub r12, r1, r2 sub r9, r1, r2
// Stack for the secondary core = Number of Cores - 1 // Stack for the secondary core = Number of Cores - 1
LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0) LoadConstantToReg (FixedPcdGet32(PcdCoreCount), r0)
sub r0, r0, #1 sub r0, r0, #1
LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1) LoadConstantToReg (FixedPcdGet32(PcdCPUCoreSecondaryStackSize), r1)
mul r1, r1, r0 mul r1, r1, r0
sub r12, r12, r1 sub r9, r9, r1
// r12 = The base of the MpCore Stacks (primary stack & secondary stacks) // r9 = The base of the MpCore Stacks (primary stack & secondary stacks)
mov r0, r12 mov r0, r9
mov r1, r10 mov r1, r10
//ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize) //ArmPlatformStackSet(StackBase, MpId, PrimaryStackSize, SecondaryStackSize)
LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2) LoadConstantToReg (FixedPcdGet32(PcdCPUCorePrimaryStackSize), r2)
@ -180,7 +180,7 @@ _GetStackBase:
_PrepareArguments: _PrepareArguments:
mov r0, r10 mov r0, r10
mov r1, r11 mov r1, r11
mov r2, r12 mov r2, r9
// Move sec startup address into a data register // Move sec startup address into a data register
// Ensure we're jumping to FV version of the code (not boot remapped alias) // Ensure we're jumping to FV version of the code (not boot remapped alias)