From: Ard Biesheuvel Date: Wed, 13 Apr 2016 11:47:46 +0000 (+0200) Subject: ArmVirtPkg/RelocatableVirtHelper: use correct FindMemNode argument order X-Git-Tag: edk2-stable201903~7323 X-Git-Url: https://git.proxmox.com/?p=mirror_edk2.git;a=commitdiff_plain;h=8457f5e40277d682b2de25f7769106a2cf803216 ArmVirtPkg/RelocatableVirtHelper: use correct FindMemNode argument order Commit 03b6bed17ea6 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 Acked-by: Laszlo Ersek --- diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S index 0980a38720..27ad07a1a1 100644 --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S @@ -82,8 +82,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - adr x1, PcdGet64 (PcdSystemMemorySize) - adr x2, PcdGet64 (PcdSystemMemoryBase) + adr x1, PcdGet64 (PcdSystemMemoryBase) + adr x2, PcdGet64 (PcdSystemMemorySize) mov sp, x7 bl FindMemnode cbz x0, .Lout diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S index 3d77ea2157..097038806e 100644 --- a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S @@ -79,8 +79,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - ldr r1, =PcdGet64 (PcdSystemMemorySize) - ldr r2, =PcdGet64 (PcdSystemMemoryBase) + ldr r1, =PcdGet64 (PcdSystemMemoryBase) + ldr r2, =PcdGet64 (PcdSystemMemorySize) mov sp, r5 bl FindMemnode teq r0, #0 diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S index ae77492bf3..940bcb2d25 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S @@ -81,8 +81,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - adr x1, PcdGet64 (PcdSystemMemorySize) - adr x2, PcdGet64 (PcdSystemMemoryBase) + adr x1, PcdGet64 (PcdSystemMemoryBase) + adr x2, PcdGet64 (PcdSystemMemorySize) mov sp, x7 bl FindMemnode cbz x0, .Lout diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S index b69c6d618a..539426f36f 100644 --- a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S +++ b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S @@ -78,8 +78,8 @@ ASM_PFX(ArmPlatformPeiBootAction): // encountered. Since we are calling a C function, use the window at the // beginning of the FD image as a temp stack. // - ldr r1, =PcdGet64 (PcdSystemMemorySize) - ldr r2, =PcdGet64 (PcdSystemMemoryBase) + ldr r1, =PcdGet64 (PcdSystemMemoryBase) + ldr r2, =PcdGet64 (PcdSystemMemorySize) mov sp, r5 bl FindMemnode teq r0, #0