UefiCpuPkg: Move AsmRelocateApLoopStart from Mpfuncs.nasm to AmdSev.nasm

[mirror_edk2.git] / ArmPkg / Library / ArmCacheMaintenanceLib / ArmCacheMaintenanceLib.c

diff --git a/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c b/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c
index 65ba8749e79604ddf2b0c74f6bd3093d2d74d9f4..bad5d244cbbadc8a96938f48c048dcb13143e26e 100644 (file)
--- a/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c
+++ b/ArmPkg/Library/ArmCacheMaintenanceLib/ArmCacheMaintenanceLib.c
@@ -1,15 +1,9 @@
 /** @file\r
 \r
   Copyright (c) 2008 - 2009, Apple Inc. All rights reserved.<BR>\r
-  Copyright (c) 2011 - 2014, ARM Limited. All rights reserved.\r
+  Copyright (c) 2011 - 2021, ARM Limited. All rights reserved.\r
 \r
-  This program and the accompanying materials\r
-  are licensed and made available under the terms and conditions of the BSD License\r
-  which accompanies this distribution.  The full text of the license may be found at\r
-  http://opensource.org/licenses/bsd-license.php\r
-\r
-  THE PROGRAM IS DISTRIBUTED UNDER THE BSD LICENSE ON AN "AS IS" BASIS,\r
-  WITHOUT WARRANTIES OR REPRESENTATIONS OF ANY KIND, EITHER EXPRESS OR IMPLIED.\r
+  SPDX-License-Identifier: BSD-2-Clause-Patent\r
 \r
 **/\r
 #include <Base.h>\r
@@ -17,25 +11,30 @@
 #include <Library/DebugLib.h>\r
 #include <Library/PcdLib.h>\r
 \r
+STATIC\r
 VOID\r
 CacheRangeOperation (\r
   IN  VOID            *Start,\r
   IN  UINTN           Length,\r
-  IN  LINE_OPERATION  LineOperation\r
+  IN  LINE_OPERATION  LineOperation,\r
+  IN  UINTN           LineLength\r
   )\r
 {\r
-  UINTN ArmCacheLineLength         = ArmDataCacheLineLength();\r
-  UINTN ArmCacheLineAlignmentMask  = ArmCacheLineLength - 1;\r
-\r
+  UINTN  ArmCacheLineAlignmentMask;\r
   // Align address (rounding down)\r
-  UINTN AlignedAddress = (UINTN)Start - ((UINTN)Start & ArmCacheLineAlignmentMask);\r
-  UINTN EndAddress     = (UINTN)Start + Length;\r
+  UINTN  AlignedAddress;\r
+  UINTN  EndAddress;\r
+\r
+  ArmCacheLineAlignmentMask = LineLength - 1;\r
+  AlignedAddress            = (UINTN)Start - ((UINTN)Start & ArmCacheLineAlignmentMask);\r
+  EndAddress                = (UINTN)Start + Length;\r
 \r
   // Perform the line operation on an address in each cache line\r
   while (AlignedAddress < EndAddress) {\r
-    LineOperation(AlignedAddress);\r
-    AlignedAddress += ArmCacheLineLength;\r
+    LineOperation (AlignedAddress);\r
+    AlignedAddress += LineLength;\r
   }\r
+\r
   ArmDataSynchronizationBarrier ();\r
 }\r
 \r
@@ -45,7 +44,7 @@ InvalidateInstructionCache (
   VOID\r
   )\r
 {\r
-  ArmInvalidateInstructionCache();\r
+  ASSERT (FALSE);\r
 }\r
 \r
 VOID\r
@@ -60,12 +59,25 @@ InvalidateDataCache (
 VOID *\r
 EFIAPI\r
 InvalidateInstructionCacheRange (\r
-  IN      VOID                      *Address,\r
-  IN      UINTN                     Length\r
+  IN      VOID   *Address,\r
+  IN      UINTN  Length\r
   )\r
 {\r
-  CacheRangeOperation (Address, Length, ArmCleanDataCacheEntryByMVA);\r
-  ArmInvalidateInstructionCache ();\r
+  CacheRangeOperation (\r
+    Address,\r
+    Length,\r
+    ArmCleanDataCacheEntryToPoUByMVA,\r
+    ArmDataCacheLineLength ()\r
+    );\r
+  CacheRangeOperation (\r
+    Address,\r
+    Length,\r
+    ArmInvalidateInstructionCacheEntryToPoUByMVA,\r
+    ArmInstructionCacheLineLength ()\r
+    );\r
+\r
+  ArmInstructionSynchronizationBarrier ();\r
+\r
   return Address;\r
 }\r
 \r
@@ -81,11 +93,16 @@ WriteBackInvalidateDataCache (
 VOID *\r
 EFIAPI\r
 WriteBackInvalidateDataCacheRange (\r
-  IN      VOID                      *Address,\r
-  IN      UINTN                     Length\r
+  IN      VOID   *Address,\r
+  IN      UINTN  Length\r
   )\r
 {\r
-  CacheRangeOperation(Address, Length, ArmCleanInvalidateDataCacheEntryByMVA);\r
+  CacheRangeOperation (\r
+    Address,\r
+    Length,\r
+    ArmCleanInvalidateDataCacheEntryByMVA,\r
+    ArmDataCacheLineLength ()\r
+    );\r
   return Address;\r
 }\r
 \r
@@ -101,21 +118,31 @@ WriteBackDataCache (
 VOID *\r
 EFIAPI\r
 WriteBackDataCacheRange (\r
-  IN      VOID                      *Address,\r
-  IN      UINTN                     Length\r
+  IN      VOID   *Address,\r
+  IN      UINTN  Length\r
   )\r
 {\r
-  CacheRangeOperation(Address, Length, ArmCleanDataCacheEntryByMVA);\r
+  CacheRangeOperation (\r
+    Address,\r
+    Length,\r
+    ArmCleanDataCacheEntryByMVA,\r
+    ArmDataCacheLineLength ()\r
+    );\r
   return Address;\r
 }\r
 \r
 VOID *\r
 EFIAPI\r
 InvalidateDataCacheRange (\r
-  IN      VOID                      *Address,\r
-  IN      UINTN                     Length\r
+  IN      VOID   *Address,\r
+  IN      UINTN  Length\r
   )\r
 {\r
-  CacheRangeOperation(Address, Length, ArmInvalidateDataCacheEntryByMVA);\r
+  CacheRangeOperation (\r
+    Address,\r
+    Length,\r
+    ArmInvalidateDataCacheEntryByMVA,\r
+    ArmDataCacheLineLength ()\r
+    );\r
   return Address;\r
 }\r