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

ArmVirtPkg/RelocatableVirtHelper: use correct FindMemNode argument order

Browse Source 
Commit 03b6bed17e ArmVirtPkg/XenRelocatablePlatformLib: rewrite DTB
memory node retrieval in C") introduced a FindMemNode () C function
that takes pointers to system memory base and size as arguments, but the
calling code passes them in the wrong order.

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-04-13 13:47:46 +02:00
parent 488182b6fa
commit 8457f5e402
4 changed files with 8 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S
View File

@@ -82,8 +82,8 @@ ASM_PFX(ArmPlatformPeiBootAction):
// encountered. Since we are calling a C function, use the window at the // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack. // beginning of the FD image as a temp stack.
// //
adr x1, PcdGet64 (PcdSystemMemorySize) adr x1, PcdGet64 (PcdSystemMemoryBase)
adr x2, PcdGet64 (PcdSystemMemoryBase) adr x2, PcdGet64 (PcdSystemMemorySize)
mov sp, x7 mov sp, x7
bl FindMemnode bl FindMemnode
cbz x0, .Lout cbz x0, .Lout

4
ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S
View File

@@ -79,8 +79,8 @@ ASM_PFX(ArmPlatformPeiBootAction):
// encountered. Since we are calling a C function, use the window at the // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack. // beginning of the FD image as a temp stack.
// //
ldr r1, =PcdGet64 (PcdSystemMemorySize) ldr r1, =PcdGet64 (PcdSystemMemoryBase)
ldr r2, =PcdGet64 (PcdSystemMemoryBase) ldr r2, =PcdGet64 (PcdSystemMemorySize)
mov sp, r5 mov sp, r5
bl FindMemnode bl FindMemnode
teq r0, #0 teq r0, #0

4
ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S
View File

@@ -81,8 +81,8 @@ ASM_PFX(ArmPlatformPeiBootAction):
// encountered. Since we are calling a C function, use the window at the // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack. // beginning of the FD image as a temp stack.
// //
adr x1, PcdGet64 (PcdSystemMemorySize) adr x1, PcdGet64 (PcdSystemMemoryBase)
adr x2, PcdGet64 (PcdSystemMemoryBase) adr x2, PcdGet64 (PcdSystemMemorySize)
mov sp, x7 mov sp, x7
bl FindMemnode bl FindMemnode
cbz x0, .Lout cbz x0, .Lout

4
ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S
View File

@@ -78,8 +78,8 @@ ASM_PFX(ArmPlatformPeiBootAction):
// encountered. Since we are calling a C function, use the window at the // encountered. Since we are calling a C function, use the window at the
// beginning of the FD image as a temp stack. // beginning of the FD image as a temp stack.
// //
ldr r1, =PcdGet64 (PcdSystemMemorySize) ldr r1, =PcdGet64 (PcdSystemMemoryBase)
ldr r2, =PcdGet64 (PcdSystemMemoryBase) ldr r2, =PcdGet64 (PcdSystemMemorySize)
mov sp, r5 mov sp, r5
bl FindMemnode bl FindMemnode
teq r0, #0 teq r0, #0