ArmVirtPkg/ArmVirtGicArchLib: adapt ASSERT()s to 64-bit base addresses

Since All the GIC base address variables has been aligned to 64-bit, it
doesn't make sense to continue use MAX_UINT32 in ASSERT() statement, so
this patch uses MAX_UINTN to adapt to this kind of change.

Contributed-under: TianoCore Contribution Agreement 1.0
Cc: Leif Lindholm <leif.lindholm@linaro.org>
Signed-off-by: Dennis Chen <dennis.chen@arm.com>
Acked-by: Laszlo Ersek <lersek@redhat.com>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>

diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
index 64afc4de6b4d75de43e42470ad2572cae1c35478..648806126e7807721275ebf403154f6f59b3a899 100644 (file)
--- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
+++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
@@ -79,11 +79,11 @@ ArmVirtGicArchLibConstructor (
 \r
     // RegProp[0..1] == { GICD base, GICD size }\r
     DistBase = SwapBytes64 (Reg[0]);\r
-    ASSERT (DistBase < MAX_UINT32);\r
+    ASSERT (DistBase < MAX_UINTN);\r
 \r
     // RegProp[2..3] == { GICR base, GICR size }\r
     RedistBase = SwapBytes64 (Reg[2]);\r
-    ASSERT (RedistBase < MAX_UINT32);\r
+    ASSERT (RedistBase < MAX_UINTN);\r
 \r
     PcdSet64 (PcdGicDistributorBase, DistBase);\r
     PcdSet64 (PcdGicRedistributorsBase, RedistBase);\r
@@ -117,8 +117,8 @@ ArmVirtGicArchLibConstructor (
 \r
     DistBase = SwapBytes64 (Reg[0]);\r
     CpuBase  = SwapBytes64 (Reg[2]);\r
-    ASSERT (DistBase < MAX_UINT32);\r
-    ASSERT (CpuBase < MAX_UINT32);\r
+    ASSERT (DistBase < MAX_UINTN);\r
+    ASSERT (CpuBase < MAX_UINTN);\r
 \r
     PcdSet64 (PcdGicDistributorBase, DistBase);\r
     PcdSet64 (PcdGicInterruptInterfaceBase, CpuBase);\r