ArmPkg/ArmGicDxe ARM: fix encoding for GICv3 interrupt acknowledge

Fix a typo in the 32-bit ARM version of the GICv3 driver, which uses
the wrong system register encoding to access ICC_IAR1, and attempted
to access ICC_IAR0 instead. This results in boot time hangs both
under QEMU emulation and on real hardware.

Contributed-under: TianoCore Contribution Agreement 1.1
Signed-off-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
Reviewed-by: Leif Lindholm <leif.lindholm@linaro.org>

diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
index a72f3c86516350c9da4f3505bc5fd2da6b992f35..c308d2fa3e2ffda132a8b7c914e74c797efdd7e4 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
+++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.S
@@ -66,7 +66,7 @@ ASM_FUNC(ArmGicV3EndOfInterrupt)
 //  VOID\r
 //  );\r
 ASM_FUNC(ArmGicV3AcknowledgeInterrupt)\r
-        mrc     p15, 0, r0, c12, c8, 0 //ICC_IAR1\r
+        mrc     p15, 0, r0, c12, c12, 0 //ICC_IAR1\r
         bx      lr\r
 \r
 //VOID\r

diff --git a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm
index 4228fb59be54d80ae2a9fe25b8ed3396f7425eb8..222047d1ad43569b06428489a83beb15f158d2e4 100644 (file)
--- a/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm
+++ b/ArmPkg/Drivers/ArmGic/GicV3/Arm/ArmGicV3.asm
@@ -66,7 +66,7 @@
 //  VOID\r
 //  );\r
  RVCT_ASM_EXPORT ArmGicV3AcknowledgeInterrupt\r
-        mrc     p15, 0, r0, c12, c8, 0 //ICC_IAR1\r
+        mrc     p15, 0, r0, c12, c12, 0 //ICC_IAR1\r
         bx      lr\r
 \r
 //VOID\r