ArmVirtPkg: fix ASSERT in ArmVirtGicArchLib with virtualization=on

[mirror_edk2.git] / ArmVirtPkg / Library / ArmVirtGicArchLib / ArmVirtGicArchLib.c

diff --git a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
index af6b3af60edf17c6ee2ab78a3c2403effe9cc838..5448865ad8e81b8edac21bd5eb34eb18703fad6a 100644 (file)
--- a/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
+++ b/ArmVirtPkg/Library/ArmVirtGicArchLib/ArmVirtGicArchLib.c
@@ -110,7 +110,12 @@ ArmVirtGicArchLibConstructor (
     break;\r
 \r
   case 2:\r
-    ASSERT (RegSize == 32);\r
+    //\r
+    // When the GICv2 is emulated with virtualization=on, it adds a virtual\r
+    // set of control registers. This means the register property can be\r
+    // either 32 or 64 bytes in size.\r
+    //\r
+    ASSERT ((RegSize == 32) || (RegSize == 64));\r
 \r
     DistBase = SwapBytes64 (Reg[0]);\r
     CpuBase  = SwapBytes64 (Reg[2]);\r