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 <ard.biesheuvel@linaro.org>
Acked-by: Laszlo Ersek <lersek@redhat.com>

diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S
index 0980a387207fec123899818ffb41d99b8602e36d..27ad07a1a1976bfb7fb98e0e617037bb0e9a084d 100644 (file)
--- 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\r
   // beginning of the FD image as a temp stack.\r
   //\r
-  adr   x1, PcdGet64 (PcdSystemMemorySize)\r
-  adr   x2, PcdGet64 (PcdSystemMemoryBase)\r
+  adr   x1, PcdGet64 (PcdSystemMemoryBase)\r
+  adr   x2, PcdGet64 (PcdSystemMemorySize)\r
   mov   sp, x7\r
   bl    FindMemnode\r
   cbz   x0, .Lout\r

diff --git a/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmQemuRelocatablePlatformLib/ARM/RelocatableVirtHelper.S
index 3d77ea2157098cfa04e6c8b65179b5234297209f..097038806ecd5578c0d28a1b5ca60d3c8dbf6c57 100644 (file)
--- 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\r
   // beginning of the FD image as a temp stack.\r
   //\r
-  ldr   r1, =PcdGet64 (PcdSystemMemorySize)\r
-  ldr   r2, =PcdGet64 (PcdSystemMemoryBase)\r
+  ldr   r1, =PcdGet64 (PcdSystemMemoryBase)\r
+  ldr   r2, =PcdGet64 (PcdSystemMemorySize)\r
   mov   sp, r5\r
   bl    FindMemnode\r
   teq   r0, #0\r

diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/AARCH64/RelocatableVirtHelper.S
index ae77492bf363253514703632abaf6a2cb7d7a286..940bcb2d257ade70409312e92a4e06fb30fa4df9 100644 (file)
--- 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\r
   // beginning of the FD image as a temp stack.\r
   //\r
-  adr   x1, PcdGet64 (PcdSystemMemorySize)\r
-  adr   x2, PcdGet64 (PcdSystemMemoryBase)\r
+  adr   x1, PcdGet64 (PcdSystemMemoryBase)\r
+  adr   x2, PcdGet64 (PcdSystemMemorySize)\r
   mov   sp, x7\r
   bl    FindMemnode\r
   cbz   x0, .Lout\r

diff --git a/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S b/ArmVirtPkg/Library/ArmXenRelocatablePlatformLib/ARM/RelocatableVirtHelper.S
index b69c6d618a26aa61e18319ad40e8925003244cef..539426f36f503f22b2a442637d4feddbf8ae81f6 100644 (file)
--- 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\r
   // beginning of the FD image as a temp stack.\r
   //\r
-  ldr   r1, =PcdGet64 (PcdSystemMemorySize)\r
-  ldr   r2, =PcdGet64 (PcdSystemMemoryBase)\r
+  ldr   r1, =PcdGet64 (PcdSystemMemoryBase)\r
+  ldr   r2, =PcdGet64 (PcdSystemMemorySize)\r
   mov   sp, r5\r
   bl    FindMemnode\r
   teq   r0, #0\r