ArmPkg: ArmLib: purge incorrect ArmDrainWriteBuffer () alias

In ArmLib, there exists an alias for ArmDataSynchronizationBarrier,
named after one of several names for the pre-ARMv6 cp15 operation that
was formalised into the Data Synchronization Barrier in ARMv6.

This alias is also the one called from within ArmLib, in preference of
the correct name. Through the power of code reuse, this name slipped
into the AArch64 variant as well.

Expunge it from the codebase.

Contributed-under: TianoCore Contribution Agreement 1.0
Signed-off-by: Leif Lindholm <leif.lindholm@linaro.org>
Reviewed-by: Ard Biesheuvel <ard.biesheuvel@linaro.org>
git-svn-id: https://svn.code.sf.net/p/edk2/code/trunk/edk2@18915 6f19259b-4bc3-4df7-8a09-765794883524

diff --git a/ArmPkg/Include/Library/ArmLib.h b/ArmPkg/Include/Library/ArmLib.h
index a328146b6947dd1e465d146b6e171953ade08e03..9622444ec63f61b4d2aaf0653ad7540b96695d56 100644 (file)
--- a/ArmPkg/Include/Library/ArmLib.h
+++ b/ArmPkg/Include/Library/ArmLib.h
@@ -391,12 +391,6 @@ ArmSetHighVectors (
   VOID\r
   );\r
 \r
   VOID\r
   );\r
 \r

-VOID\r
-EFIAPI\r
-ArmDrainWriteBuffer (\r
-  VOID\r
-  );\r
-\r

 VOID\r
 EFIAPI\r
 ArmDataMemoryBarrier (\r
 VOID\r
 EFIAPI\r
 ArmDataMemoryBarrier (\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
index dec125f248cd2af79eb127256633c7c32282d97a..ec35097b4096a445ff7260694966b6cddc9fac69 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Lib.c
@@ -33,7 +33,7 @@ AArch64DataCacheOperation (
 \r
   AArch64AllDataCachesOperation (DataCacheOperation);\r
 \r
 \r
   AArch64AllDataCachesOperation (DataCacheOperation);\r
 \r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

 \r
   if (SavedInterruptState) {\r
     ArmEnableInterrupts ();\r
 \r
   if (SavedInterruptState) {\r
     ArmEnableInterrupts ();\r


@@ -46,7 +46,7 @@ ArmInvalidateDataCache (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

   AArch64DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r
   AArch64DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r


@@ -56,7 +56,7 @@ ArmCleanInvalidateDataCache (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

   AArch64DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r
   AArch64DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r


@@ -66,6 +66,6 @@ ArmCleanDataCache (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

   AArch64DataCacheOperation (ArmCleanDataCacheEntryBySetWay);\r
 }\r
   AArch64DataCacheOperation (ArmCleanDataCacheEntryBySetWay);\r
 }\r

diff --git a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
index df2dc935c122327e43d6399fca2348125dd9d6a2..c530d19e897e3548fe28d3461d610c82f6cd268e 100644 (file)
--- a/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
+++ b/ArmPkg/Library/ArmLib/AArch64/AArch64Support.S
@@ -26,7 +26,6 @@ GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryByMVA)
 GCC_ASM_EXPORT (ArmInvalidateDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmInvalidateDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryBySetWay)\r

-GCC_ASM_EXPORT (ArmDrainWriteBuffer)\r

 GCC_ASM_EXPORT (ArmEnableMmu)\r
 GCC_ASM_EXPORT (ArmDisableMmu)\r
 GCC_ASM_EXPORT (ArmDisableCachesAndMmu)\r
 GCC_ASM_EXPORT (ArmEnableMmu)\r
 GCC_ASM_EXPORT (ArmDisableMmu)\r
 GCC_ASM_EXPORT (ArmDisableCachesAndMmu)\r


@@ -364,7 +363,6 @@ ASM_PFX(ArmDataMemoryBarrier):
 \r
 \r
 ASM_PFX(ArmDataSynchronizationBarrier):\r
 \r
 \r
 ASM_PFX(ArmDataSynchronizationBarrier):\r

-ASM_PFX(ArmDrainWriteBuffer):\r

   dsb   sy\r
   ret\r
 \r
   dsb   sy\r
   ret\r
 \r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
index b53f455bfad295825266c444fa52682ef3254361..23a7f2f2bb235106deed74873794e31e418eb4e9 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Lib.c
@@ -32,7 +32,7 @@ ArmV7DataCacheOperation (
 \r
   ArmV7AllDataCachesOperation (DataCacheOperation);\r
 \r
 \r
   ArmV7AllDataCachesOperation (DataCacheOperation);\r
 \r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

 \r
   if (SavedInterruptState) {\r
     ArmEnableInterrupts ();\r
 \r
   if (SavedInterruptState) {\r
     ArmEnableInterrupts ();\r


@@ -45,7 +45,7 @@ ArmInvalidateDataCache (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

   ArmV7DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r
   ArmV7DataCacheOperation (ArmInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r


@@ -55,7 +55,7 @@ ArmCleanInvalidateDataCache (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

   ArmV7DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r
   ArmV7DataCacheOperation (ArmCleanInvalidateDataCacheEntryBySetWay);\r
 }\r
 \r


@@ -65,6 +65,6 @@ ArmCleanDataCache (
   VOID\r
   )\r
 {\r
   VOID\r
   )\r
 {\r

-  ArmDrainWriteBuffer ();\r
+  ArmDataSynchronizationBarrier ();\r

   ArmV7DataCacheOperation (ArmCleanDataCacheEntryBySetWay);\r
 }\r
   ArmV7DataCacheOperation (ArmCleanDataCacheEntryBySetWay);\r
 }\r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
index 7366eee6dc4ff96d26bcd70240112fe3b0902ea2..5f030d92de3111f274f36aab9aec0b36991dbd21 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.S
@@ -23,7 +23,6 @@ GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryByMVA)
 GCC_ASM_EXPORT (ArmInvalidateDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmInvalidateDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanDataCacheEntryBySetWay)\r
 GCC_ASM_EXPORT (ArmCleanInvalidateDataCacheEntryBySetWay)\r

-GCC_ASM_EXPORT (ArmDrainWriteBuffer)\r

 GCC_ASM_EXPORT (ArmEnableMmu)\r
 GCC_ASM_EXPORT (ArmDisableMmu)\r
 GCC_ASM_EXPORT (ArmDisableCachesAndMmu)\r
 GCC_ASM_EXPORT (ArmEnableMmu)\r
 GCC_ASM_EXPORT (ArmDisableMmu)\r
 GCC_ASM_EXPORT (ArmDisableCachesAndMmu)\r


@@ -261,7 +260,6 @@ ASM_PFX(ArmDataMemoryBarrier):
   bx      LR\r
 \r
 ASM_PFX(ArmDataSynchronizationBarrier):\r
   bx      LR\r
 \r
 ASM_PFX(ArmDataSynchronizationBarrier):\r

-ASM_PFX(ArmDrainWriteBuffer):\r

   dsb\r
   bx      LR\r
 \r
   dsb\r
   bx      LR\r
 \r

diff --git a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
index 78a12e1629b476918ad82400517707a4f5563dfb..542157bef7ae848904226c81266d22e3c617a22b 100644 (file)
--- a/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
+++ b/ArmPkg/Library/ArmLib/ArmV7/ArmV7Support.asm
@@ -20,7 +20,6 @@
     EXPORT  ArmInvalidateDataCacheEntryBySetWay\r
     EXPORT  ArmCleanDataCacheEntryBySetWay\r
     EXPORT  ArmCleanInvalidateDataCacheEntryBySetWay\r
     EXPORT  ArmInvalidateDataCacheEntryBySetWay\r
     EXPORT  ArmCleanDataCacheEntryBySetWay\r
     EXPORT  ArmCleanInvalidateDataCacheEntryBySetWay\r

-    EXPORT  ArmDrainWriteBuffer\r

     EXPORT  ArmEnableMmu\r
     EXPORT  ArmDisableMmu\r
     EXPORT  ArmDisableCachesAndMmu\r
     EXPORT  ArmEnableMmu\r
     EXPORT  ArmDisableMmu\r
     EXPORT  ArmDisableCachesAndMmu\r


@@ -255,7 +254,6 @@ ArmDataMemoryBarrier
   bx      LR\r
 \r
 ArmDataSynchronizationBarrier\r
   bx      LR\r
 \r
 ArmDataSynchronizationBarrier\r

-ArmDrainWriteBuffer\r

   dsb\r
   bx      LR\r
 \r
   dsb\r
   bx      LR\r
 \r