ArmPkg: ArmLib: purge incorrect ArmDrainWriteBuffer () alias

[mirror_edk2.git] / ArmPkg / Library / ArmLib / ArmV7 / ArmV7Lib.c

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
index 44edff869eaeb9ad253d4f35c41ac824ffdaef3f..23a7f2f2bb235106deed74873794e31e418eb4e9 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
@@ -20,33 +20,6 @@
 #include "ArmV7Lib.h"\r
 #include "ArmLibPrivate.h"\r
 \r
-UINTN\r
-EFIAPI\r
-ArmDataCacheLineLength (\r
-  VOID\r
-  )\r
-{\r
-  UINT32 CCSIDR = ReadCCSIDR (0) & 7;\r
-\r
-  // * 4 converts to bytes\r
-  return (1 << (CCSIDR + 2)) * 4;\r
-}\r
-\r
-UINTN\r
-EFIAPI\r
-ArmInstructionCacheLineLength (\r
-  VOID\r
-  )\r
-{\r
-  UINT32 CCSIDR = ReadCCSIDR (1) & 7;\r
-\r
-  // * 4 converts to bytes\r
-  return (1 << (CCSIDR + 2)) * 4;\r
-\r
-//  return 64;\r
-}\r
-\r
-\r
 VOID\r
 ArmV7DataCacheOperation (\r
   IN  ARM_V7_CACHE_OPERATION  DataCacheOperation\r
@@ -59,7 +32,7 @@ ArmV7DataCacheOperation (
 \r
   ArmV7AllDataCachesOperation (DataCacheOperation);\r
 \r
-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r
 \r
   if (SavedInterruptState) {\r
     ArmEnableInterrupts ();\r
@@ -72,7 +45,7 @@ ArmInvalidateDataCache (
   VOID\r
   )\r
 {\r
-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r
   ArmV7DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r
@@ -82,7 +55,7 @@ ArmCleanInvalidateDataCache (
   VOID\r
   )\r
 {\r
-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r
   ArmV7DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r
@@ -92,6 +65,6 @@ ArmCleanDataCache (
   VOID\r
   )\r
 {\r
-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r
   ArmV7DataCacheOperation (ArmCleanDataCacheEntryBySetWay);\r
 }\r