ArmPkg: Fix Ecc error 5007 in StandaloneMmMmuLib

[mirror_edk2.git] / ArmPkg / Library / StandaloneMmMmuLib / AArch64 / ArmMmuStandaloneMmLib.c

diff --git a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c b/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
index 3806490f7006dd6011a566a2ab1b635bd6d6a504..5a316bc2566a33c731dfdd70d6a7c4197dfb8821 100644 (file)
--- a/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
+++ b/ArmPkg/Library/StandaloneMmMmuLib/AArch64/ArmMmuStandaloneMmLib.c
@@ -1,7 +1,7 @@
 /** @file\r
 *  File managing the MMU for ARMv8 architecture in S-EL0\r
 *\r
-*  Copyright (c) 2017 - 2018, ARM Limited. All rights reserved.\r
+*  Copyright (c) 2017 - 2021, Arm Limited. All rights reserved.<BR>\r
 *\r
 *  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 *\r
@@ -14,6 +14,7 @@
 #include <Library/ArmMmuLib.h>\r
 #include <Library/ArmSvcLib.h>\r
 #include <Library/BaseLib.h>\r
+#include <Library/BaseMemoryLib.h>\r
 #include <Library/DebugLib.h>\r
 \r
 STATIC\r
@@ -23,12 +24,12 @@ GetMemoryPermissions (
   OUT UINT32                    *MemoryAttributes\r
   )\r
 {\r
-  ARM_SVC_ARGS  GetMemoryPermissionsSvcArgs = {0};\r
+  ARM_SVC_ARGS  GetMemoryPermissionsSvcArgs;\r
+\r
+  ZeroMem (&GetMemoryPermissionsSvcArgs, sizeof (ARM_SVC_ARGS));\r
 \r
   GetMemoryPermissionsSvcArgs.Arg0 = ARM_SVC_ID_SP_GET_MEM_ATTRIBUTES_AARCH64;\r
   GetMemoryPermissionsSvcArgs.Arg1 = BaseAddress;\r
-  GetMemoryPermissionsSvcArgs.Arg2 = 0;\r
-  GetMemoryPermissionsSvcArgs.Arg3 = 0;\r
 \r
   ArmCallSvc (&GetMemoryPermissionsSvcArgs);\r
   if (GetMemoryPermissionsSvcArgs.Arg0 == ARM_SVC_SPM_RET_INVALID_PARAMS) {\r
@@ -49,7 +50,9 @@ RequestMemoryPermissionChange (
   )\r
 {\r
   EFI_STATUS    Status;\r
-  ARM_SVC_ARGS  ChangeMemoryPermissionsSvcArgs = {0};\r
+  ARM_SVC_ARGS  ChangeMemoryPermissionsSvcArgs;\r
+\r
+  ZeroMem (&ChangeMemoryPermissionsSvcArgs, sizeof (ARM_SVC_ARGS));\r
 \r
   ChangeMemoryPermissionsSvcArgs.Arg0 = ARM_SVC_ID_SP_SET_MEM_ATTRIBUTES_AARCH64;\r
   ChangeMemoryPermissionsSvcArgs.Arg1 = BaseAddress;\r