ARM Packages: Use AND instead of BIC instruction with immediate

[mirror_edk2.git] / ArmPlatformPkg / ArmVExpressPkg / Library / ArmVExpressSecLibRTSM / AArch64 / GicV3.S

diff --git a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
index 7d9c25c769e878a9d80e75ca32e143b4278dd1d3..035e0954931e0e569112a30ed852315512249b34 100644 (file)
--- a/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
+++ b/ArmPlatformPkg/ArmVExpressPkg/Library/ArmVExpressSecLibRTSM/AArch64/GicV3.S
@@ -12,6 +12,7 @@
 //\r
 \r
 #include <AsmMacroIoLibV8.h>\r
+#include <Chipset/AArch64.h>\r
 \r
 #ifndef __clang__\r
 // Register definitions used by GCC for GICv3 access.\r
@@ -64,6 +65,6 @@ ASM_PFX(InitializeGicV3):
 \r
   // Remove the SCR.NS bit\r
   mrs     x0, scr_el3\r
-  bic     x0, x0, #1\r
+  and     x0, x0, #~SCR_NS\r
   msr     scr_el3, x0\r
   ret\r